Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Build
env:
GO_VERSION: 1.25.3
GO_VERSION: 1.25.5
on:
push:
# Permission forced by repo-level setting; only elevate on job-level
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ permissions:
# packages: read
env:
PROJECTNAME: "datadog-operator"
GO_VERSION: 1.25.3
GO_VERSION: 1.25.5
jobs:
build:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
contents: read
# packages: read
env:
GO_VERSION: 1.25.3
GO_VERSION: 1.25.5
jobs:
build-linux-binary:
if: startsWith(github.ref, 'refs/tags/v')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yaml-mapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
# packages: read
env:
PROJECTNAME: "datadog-operator"
GO_VERSION: 1.25.3
GO_VERSION: 1.25.5
jobs:
yaml-mapper-test:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: registry.ddbuild.io/images/mirror/library/golang:1.25.3
image: registry.ddbuild.io/images/mirror/library/golang:1.25.5
variables:
PROJECTNAME: "datadog-operator"
PROJECTNAME_CHECK: "datadog-operator-check"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ARG FIPS_ENABLED=false

# Build the manager binary
FROM golang:1.25.3 AS builder
FROM golang:1.25.5 AS builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/DataDog/datadog-operator/api

go 1.25

toolchain go1.25.3
toolchain go1.25.5

require (
github.com/DataDog/datadog-api-client-go/v2 v2.34.0
Expand Down
2 changes: 1 addition & 1 deletion check-operator.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.25.3 AS builder
FROM golang:1.25.5 AS builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/DataDog/datadog-operator

go 1.25

toolchain go1.25.3
toolchain go1.25.5

replace github.com/DataDog/extendeddaemonset v0.10.0-rc.4 => github.com/DataDog/extendeddaemonset/api v0.0.0-20250108205105-6c4d337b78a1

Expand Down
4 changes: 2 additions & 2 deletions go.work
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
go 1.25.3
go 1.25.5

toolchain go1.25.3
toolchain go1.25.5

use (
.
Expand Down
15 changes: 11 additions & 4 deletions hack/update-golang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ source "$SCRIPTS_DIR/os-env.sh"
JQ="$ROOT/bin/$PLATFORM/jq"
YQ="$ROOT/bin/$PLATFORM/yq"

# Set SED command based on OS
if [[ "$OS" == "darwin" ]]; then
SED="gsed"
else
SED="sed"
fi

# Ensure jq and yq are available
if [[ ! -x "$JQ" ]]; then
echo "Error: jq is not executable or found at $JQ"
Expand Down Expand Up @@ -43,7 +50,7 @@ new_minor_version=$major.$minor
go_work_file="$ROOT/go.work"
if [[ -f $go_work_file ]]; then
echo "Processing $go_work_file..."
sed -i -E "s/^go [^ ].*/go $GOVERSION/gm" "$go_work_file"
$SED -i -E "s/^go [^ ].*/go $GOVERSION/gm" "$go_work_file"
else
echo "Warning: $go_work_file not found, skipping."
fi
Expand All @@ -52,7 +59,7 @@ fi
dev_container_file="$ROOT/.devcontainer/devcontainer.json"
if [[ -f $dev_container_file ]]; then
echo "Processing $dev_container_file..."
sed -i -E "s|(mcr\.microsoft\.com/devcontainers/go:)[^\"]+|\1dev-$new_minor_version|" "$dev_container_file"
$SED -i -E "s|(mcr\.microsoft\.com/devcontainers/go:)[^\"]+|\1dev-$new_minor_version|" "$dev_container_file"
else
echo "Warning: $dev_container_file not found, skipping."
fi
Expand All @@ -62,7 +69,7 @@ dockerfile_files="$ROOT/Dockerfile $ROOT/check-operator.Dockerfile"
for file in $dockerfile_files; do
if [[ -f $file ]]; then
echo "Processing $file..."
sed -i -E "s|(FROM golang:)[^ ]+|\1$GOVERSION|" "$file"
$SED -i -E "s|(FROM golang:)[^ ]+|\1$GOVERSION|" "$file"
else
echo "Warning: $file not found, skipping."
fi
Expand All @@ -72,7 +79,7 @@ done
gitlab_file="$ROOT/.gitlab-ci.yml"
if [[ -f $gitlab_file ]]; then
echo "Processing $gitlab_file..."
sed -i -E "s|(image: registry\.ddbuild\.io/images/mirror/library/golang:)[^ ]+|\1$GOVERSION|" "$gitlab_file"
$SED -i -E "s|(image: registry\.ddbuild\.io/images/mirror/library/golang:)[^ ]+|\1$GOVERSION|" "$gitlab_file"
else
echo "Warning: $gitlab_file not found, skipping."
fi
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/DataDog/datadog-operator/test/e2e

go 1.25

toolchain go1.25.3
toolchain go1.25.5

replace (
github.com/DataDog/datadog-agent/comp/core/tagger/types => github.com/DataDog/datadog-agent/comp/core/tagger/types v0.63.0-rc.1
Expand Down
Loading