Merge pull request GoogleCloudPlatform#1963 from justinsb/update_gola…

…ng_1_22_4

Add script to update golang; bump to 1.22.4

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.22.3 AS builder
+FROM golang:1.22.4 AS builder
 
 # Copy in the Go source code
 WORKDIR /go/src/github.com/GoogleCloudPlatform/k8s-config-connector

build/tooling/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.22 AS builder
+FROM golang:1.22.4 AS builder
 
 RUN GO111MODULE=on go install sigs.k8s.io/controller-tools/cmd/[email protected]
 

dev/codebots/update-golang-version

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+set -x
+
+
+REPO_ROOT=$(git rev-parse --show-toplevel)
+cd ${REPO_ROOT}
+
+
+GO_TOOLCHAIN=$(curl https://go.dev/dl/?mode=json | jq -r '[.[] | select(.stable == true)] | .[0].version')
+echo "GO_TOOLCHAIN=$GO_TOOLCHAIN"
+
+# GO_VERSION is the GO_TOOLCHAIN without the go prefix
+GO_VERSION=${GO_TOOLCHAIN#go}
+echo "GO_VERSION=$GO_VERSION"
+
+# Update go.mod files
+cd ${REPO_ROOT}
+for f in $(git ls-files 'go.mod' '**/go.mod'); do
+  cd ${REPO_ROOT}
+  cd $(dirname $f)
+  echo "Updating $f to toolchain $GO_TOOLCHAIN"
+  go mod edit -toolchain=${GO_TOOLCHAIN}
+done
+
+# Update Docker images
+cd ${REPO_ROOT}
+for f in $(git ls-files 'Dockerfile*' '**/Dockerfile*'); do
+  echo "Updating Dockerfile $f to go image $GO_VERSION"
+  sed -i -e "s/FROM golang:[0-9.]*/FROM golang:$GO_VERSION/g" $f
+done
+
+# Ignore third_party changes
+cd ${REPO_ROOT}
+git co -- third_party/

experiments/composite/go.mod

@@ -2,4 +2,4 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/composite
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4

experiments/compositions/composition/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.22.3 as builder
+FROM golang:1.22.4 as builder
 ARG TARGETOS
 ARG TARGETARCH
 

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.22 AS build-stage
+FROM golang:1.22.4 AS build-stage
 
 # Set destination for COPY
 WORKDIR /go/src/app

experiments/compositions/composition/Dockerfile.inline

@@ -2,7 +2,7 @@
 
 # ----------------- Build Container ---------------------------
 # Build the go app.
-FROM golang:1.22.3 AS build-stage
+FROM golang:1.22.4 AS build-stage
 
 # Set destination for COPY
 WORKDIR /go/src/app

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.22 AS build-stage
+FROM golang:1.22.4 AS build-stage
 
 # Set destination for COPY
 WORKDIR /go/src/app

experiments/compositions/composition/go.mod

@@ -2,7 +2,7 @@ module google.com/composition
 
 go 1.22.0
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1

experiments/compositions/facade/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.22.3 as builder
+FROM golang:1.22.4 as builder
 ARG TARGETOS
 ARG TARGETARCH
 

experiments/compositions/facade/go.mod

@@ -2,7 +2,7 @@ module facade
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	k8s.io/apimachinery v0.28.3

go.mod

@@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 replace github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp => ./mockgcp
 

mockgcp/go.mod

@@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	cloud.google.com/go/compute v1.23.0

operator/Dockerfile

@@ -15,7 +15,7 @@
 # This Dockefile builds a thin image containing the manager binary
 
 # Build the manager binary
-FROM golang:1.22.3 AS builder
+FROM golang:1.22.4 AS builder
 
 # Copy in the Go source code
 WORKDIR /go/src/github.com/GoogleCloudPlatform/k8s-config-connector