From 16a06389d974f0c5e5263bd600db49ec9a679580 Mon Sep 17 00:00:00 2001 From: justinsb Date: Tue, 14 Jan 2025 11:49:18 -0500 Subject: [PATCH] codebot: update go to 1.23.4 --- build/builder/Dockerfile | 2 +- build/tooling/Dockerfile | 2 +- dev/tools/controllerbuilder/go.mod | 2 +- experiments/composite/go.mod | 2 +- experiments/compositions/composition/Dockerfile | 2 +- .../compositions/composition/Dockerfile.getter.expander | 2 +- experiments/compositions/composition/Dockerfile.inline | 2 +- .../compositions/composition/Dockerfile.jinja2.expander | 2 +- experiments/compositions/composition/go.mod | 2 +- experiments/compositions/expanders/cel-expander/Dockerfile | 4 ++-- experiments/compositions/expanders/cel-expander/go.mod | 2 +- experiments/compositions/expanders/helm-expander/Dockerfile | 4 ++-- experiments/compositions/expanders/helm-expander/go.mod | 2 +- experiments/compositions/facade/Dockerfile | 2 +- experiments/compositions/facade/go.mod | 2 +- experiments/kompanion/go.mod | 2 +- experiments/kubectl-plan/go.mod | 2 +- go.mod | 2 +- mockgcp/go.mod | 2 +- mockgcp/tools/patch-proto/go.mod | 2 +- operator/Dockerfile | 2 +- scripts/environment-setup/golang-setup.sh | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build/builder/Dockerfile b/build/builder/Dockerfile index e767eb99be..090b9b5a47 100644 --- a/build/builder/Dockerfile +++ b/build/builder/Dockerfile @@ -14,7 +14,7 @@ # This Dockerfile builds an image containing builds of all the binaries built # from source (manager, webhook, etc.) -FROM golang:1.23.2 AS builder +FROM golang:1.23.4 AS builder # Copy in the Go source code WORKDIR /go/src/github.com/GoogleCloudPlatform/k8s-config-connector diff --git a/build/tooling/Dockerfile b/build/tooling/Dockerfile index d4aec0af36..a769b2f545 100644 --- a/build/tooling/Dockerfile +++ b/build/tooling/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.23.2 AS builder +FROM golang:1.23.4 AS builder RUN GO111MODULE=on go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0 diff --git a/dev/tools/controllerbuilder/go.mod b/dev/tools/controllerbuilder/go.mod index e21904e2fe..b78568b45f 100644 --- a/dev/tools/controllerbuilder/go.mod +++ b/dev/tools/controllerbuilder/go.mod @@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/dev/tools/controllerb go 1.22.0 -toolchain go1.23.2 +toolchain go1.23.4 require ( cloud.google.com/go/vertexai v0.13.2 diff --git a/experiments/composite/go.mod b/experiments/composite/go.mod index 4ff0645276..c95d21cf2a 100644 --- a/experiments/composite/go.mod +++ b/experiments/composite/go.mod @@ -2,4 +2,4 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/composite go 1.22 -toolchain go1.23.2 +toolchain go1.23.4 diff --git a/experiments/compositions/composition/Dockerfile b/experiments/compositions/composition/Dockerfile index b44f19260b..47faa172ef 100644 --- a/experiments/compositions/composition/Dockerfile +++ b/experiments/compositions/composition/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.23.2 as builder +FROM golang:1.23.4 as builder ARG TARGETOS ARG TARGETARCH diff --git a/experiments/compositions/composition/Dockerfile.getter.expander b/experiments/compositions/composition/Dockerfile.getter.expander index 499475d9c6..6d38d34e15 100644 --- a/experiments/compositions/composition/Dockerfile.getter.expander +++ b/experiments/compositions/composition/Dockerfile.getter.expander @@ -17,7 +17,7 @@ # ----------------- Build Container --------------------------- # Build the go app. # Explicitly set to latest vs golang:1.22 -FROM golang:1.23.2 AS build-stage +FROM golang:1.23.4 AS build-stage # Set destination for COPY WORKDIR /go/src/app diff --git a/experiments/compositions/composition/Dockerfile.inline b/experiments/compositions/composition/Dockerfile.inline index 4a49deccaf..6704165bd2 100644 --- a/experiments/compositions/composition/Dockerfile.inline +++ b/experiments/compositions/composition/Dockerfile.inline @@ -2,7 +2,7 @@ # ----------------- Build Container --------------------------- # Build the go app. -FROM golang:1.23.2 AS build-stage +FROM golang:1.23.4 AS build-stage # Set destination for COPY WORKDIR /go/src/app diff --git a/experiments/compositions/composition/Dockerfile.jinja2.expander b/experiments/compositions/composition/Dockerfile.jinja2.expander index 2a20761ddc..3a7269742d 100644 --- a/experiments/compositions/composition/Dockerfile.jinja2.expander +++ b/experiments/compositions/composition/Dockerfile.jinja2.expander @@ -17,7 +17,7 @@ # ----------------- Build Container --------------------------- # Build the go app. # Explicitly set to latest vs golang:1.22 -FROM golang:1.23.2 AS build-stage +FROM golang:1.23.4 AS build-stage # Set destination for COPY WORKDIR /go/src/app diff --git a/experiments/compositions/composition/go.mod b/experiments/compositions/composition/go.mod index fbd64cefc3..f695d73cc2 100644 --- a/experiments/compositions/composition/go.mod +++ b/experiments/compositions/composition/go.mod @@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositi go 1.22.0 -toolchain go1.23.2 +toolchain go1.23.4 require ( github.com/Masterminds/semver/v3 v3.2.1 diff --git a/experiments/compositions/expanders/cel-expander/Dockerfile b/experiments/compositions/expanders/cel-expander/Dockerfile index 673903c7dc..7d1d829616 100644 --- a/experiments/compositions/expanders/cel-expander/Dockerfile +++ b/experiments/compositions/expanders/cel-expander/Dockerfile @@ -18,7 +18,7 @@ # ----------------- Build Container --------------------------- # Build the go app. # Explicitly set to latest vs golang:1.22 -FROM golang:1.23.2 AS build-stage +FROM golang:1.23.4 AS build-stage # Set destination for COPY WORKDIR /go/src/app @@ -32,7 +32,7 @@ RUN go mod download RUN CGO_ENABLED=0 GOOS=linux go build -v -o expander main.go -FROM golang:1.23.2 as bins +FROM golang:1.23.4 as bins WORKDIR /workspace diff --git a/experiments/compositions/expanders/cel-expander/go.mod b/experiments/compositions/expanders/cel-expander/go.mod index 974786accd..b61738d120 100644 --- a/experiments/compositions/expanders/cel-expander/go.mod +++ b/experiments/compositions/expanders/cel-expander/go.mod @@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositi go 1.22.4 -toolchain go1.23.2 +toolchain go1.23.4 require ( github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition v0.0.0-20241216141910-490104000f4f diff --git a/experiments/compositions/expanders/helm-expander/Dockerfile b/experiments/compositions/expanders/helm-expander/Dockerfile index 7402b243ce..f0f125db77 100644 --- a/experiments/compositions/expanders/helm-expander/Dockerfile +++ b/experiments/compositions/expanders/helm-expander/Dockerfile @@ -18,7 +18,7 @@ # ----------------- Build Container --------------------------- # Build the go app. # Explicitly set to latest vs golang:1.22 -FROM golang:1.23.2 AS build-stage +FROM golang:1.23.4 AS build-stage # Set destination for COPY WORKDIR /go/src/app @@ -32,7 +32,7 @@ RUN go mod download RUN CGO_ENABLED=0 GOOS=linux go build -v -o expander main.go -FROM golang:1.23.2 as bins +FROM golang:1.23.4 as bins WORKDIR /workspace diff --git a/experiments/compositions/expanders/helm-expander/go.mod b/experiments/compositions/expanders/helm-expander/go.mod index c44a05059d..a94887cc2b 100644 --- a/experiments/compositions/expanders/helm-expander/go.mod +++ b/experiments/compositions/expanders/helm-expander/go.mod @@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositi go 1.22.4 -toolchain go1.23.2 +toolchain go1.23.4 require ( github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition v0.0.0-20241216141910-490104000f4f diff --git a/experiments/compositions/facade/Dockerfile b/experiments/compositions/facade/Dockerfile index 2f3103eba5..e7f1d2d4d9 100644 --- a/experiments/compositions/facade/Dockerfile +++ b/experiments/compositions/facade/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.23.2 as builder +FROM golang:1.23.4 as builder ARG TARGETOS ARG TARGETARCH diff --git a/experiments/compositions/facade/go.mod b/experiments/compositions/facade/go.mod index f0d896e1ed..8127c882c0 100644 --- a/experiments/compositions/facade/go.mod +++ b/experiments/compositions/facade/go.mod @@ -2,7 +2,7 @@ module facade go 1.22 -toolchain go1.23.2 +toolchain go1.23.4 require ( k8s.io/apimachinery v0.28.3 diff --git a/experiments/kompanion/go.mod b/experiments/kompanion/go.mod index e05e4b9b96..4f8aff2767 100644 --- a/experiments/kompanion/go.mod +++ b/experiments/kompanion/go.mod @@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/kompanion go 1.22 -toolchain go1.23.2 +toolchain go1.23.4 require ( github.com/spf13/cobra v1.8.0 diff --git a/experiments/kubectl-plan/go.mod b/experiments/kubectl-plan/go.mod index a810da827c..e194b0d0d0 100644 --- a/experiments/kubectl-plan/go.mod +++ b/experiments/kubectl-plan/go.mod @@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/kubectl-p go 1.22 -toolchain go1.23.2 +toolchain go1.23.4 require ( github.com/google/go-cmp v0.6.0 diff --git a/go.mod b/go.mod index dde617db5b..a2f8d8fd16 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector go 1.22.0 -toolchain go1.23.2 +toolchain go1.23.4 replace github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp => ./mockgcp diff --git a/mockgcp/go.mod b/mockgcp/go.mod index e66881e664..2d15e7cd9f 100644 --- a/mockgcp/go.mod +++ b/mockgcp/go.mod @@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp go 1.22 -toolchain go1.23.2 +toolchain go1.23.4 require ( cloud.google.com/go/bigtable v1.33.0 diff --git a/mockgcp/tools/patch-proto/go.mod b/mockgcp/tools/patch-proto/go.mod index 25f31c1bf7..c8298f59f8 100644 --- a/mockgcp/tools/patch-proto/go.mod +++ b/mockgcp/tools/patch-proto/go.mod @@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp/tools/patch-p go 1.22.5 -toolchain go1.23.2 +toolchain go1.23.4 require ( github.com/smacker/go-tree-sitter v0.0.0-20240625050157-a31a98a7c0f6 diff --git a/operator/Dockerfile b/operator/Dockerfile index b7dec68c54..0941e8c334 100644 --- a/operator/Dockerfile +++ b/operator/Dockerfile @@ -15,7 +15,7 @@ # This Dockefile builds a thin image containing the manager binary # Build the manager binary -FROM golang:1.23.2 AS builder +FROM golang:1.23.4 AS builder # Copy in the Go source code WORKDIR /go/src/github.com/GoogleCloudPlatform/k8s-config-connector diff --git a/scripts/environment-setup/golang-setup.sh b/scripts/environment-setup/golang-setup.sh index a31cc990d9..6ed4e86ad7 100755 --- a/scripts/environment-setup/golang-setup.sh +++ b/scripts/environment-setup/golang-setup.sh @@ -17,7 +17,7 @@ set -o errexit # Automatically updated by dev/codebots/update-golang-version -GO_VERSION="1.23.2" +GO_VERSION="1.23.4" sudo apt-get install wget wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz