From d2f00d832eaa6b2198963bae8e8824546f839385 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Mon, 19 Aug 2024 14:58:10 -0700 Subject: [PATCH] upgrade golang from 1.22.6 to 1.23.0 --- Dockerfile | 2 +- generated/1.30/apis/go.mod | 2 +- generated/1.30/client/go.mod | 2 +- go.mod | 2 +- hack/Dockerfile_fips | 2 +- hack/update-go-mod/go.mod | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index da8211097..bc06fffbf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # Copyright 2020-2024 the Pinniped contributors. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 -ARG BUILD_IMAGE=golang:1.22.6@sha256:305aae5c6d68e9c122246147f2fde17700d477c9062b6724c4d182abf6d3907e +ARG BUILD_IMAGE=golang:1.23.0@sha256:613a108a4a4b1dfb6923305db791a19d088f77632317cfc3446825c54fb862cd ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:8dd8d3ca2cf283383304fd45a5c9c74d5f2cd9da8d3b077d720e264880077c65 # Prepare to cross-compile by always running the build stage in the build platform, not the target platform. diff --git a/generated/1.30/apis/go.mod b/generated/1.30/apis/go.mod index ce0e383b6..fa491388d 100644 --- a/generated/1.30/apis/go.mod +++ b/generated/1.30/apis/go.mod @@ -3,7 +3,7 @@ module go.pinniped.dev/generated/1.30/apis go 1.22.0 -toolchain go1.22.6 +toolchain go1.23.0 require ( k8s.io/api v0.30.3 diff --git a/generated/1.30/client/go.mod b/generated/1.30/client/go.mod index 9aa9449a3..565ffe335 100644 --- a/generated/1.30/client/go.mod +++ b/generated/1.30/client/go.mod @@ -3,7 +3,7 @@ module go.pinniped.dev/generated/1.30/client go 1.22.0 -toolchain go1.22.6 +toolchain go1.23.0 replace go.pinniped.dev/generated/1.30/apis => ../apis diff --git a/go.mod b/go.mod index ba54a505c..602146a47 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module go.pinniped.dev go 1.22.0 -toolchain go1.22.6 +toolchain go1.23.0 // This version taken from https://github.com/kubernetes/apiserver/blob/v0.30.0/go.mod#L14 to avoid compile failures. replace github.com/google/cel-go => github.com/google/cel-go v0.17.8 diff --git a/hack/Dockerfile_fips b/hack/Dockerfile_fips index 62c88c2a9..93d40861b 100644 --- a/hack/Dockerfile_fips +++ b/hack/Dockerfile_fips @@ -16,7 +16,7 @@ # See https://go.googlesource.com/go/+/dev.boringcrypto/README.boringcrypto.md # and https://kupczynski.info/posts/fips-golang/ for details. -ARG BUILD_IMAGE=golang:1.22.6@sha256:305aae5c6d68e9c122246147f2fde17700d477c9062b6724c4d182abf6d3907e +ARG BUILD_IMAGE=golang:1.23.0@sha256:613a108a4a4b1dfb6923305db791a19d088f77632317cfc3446825c54fb862cd ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:8dd8d3ca2cf283383304fd45a5c9c74d5f2cd9da8d3b077d720e264880077c65 # This is not currently using --platform to prepare to cross-compile because we use gcc below to build diff --git a/hack/update-go-mod/go.mod b/hack/update-go-mod/go.mod index 3879c6e57..dbd063dbd 100644 --- a/hack/update-go-mod/go.mod +++ b/hack/update-go-mod/go.mod @@ -2,6 +2,6 @@ module go.pinniped.dev/update-go-mod go 1.22.0 -toolchain go1.22.6 +toolchain go1.23.0 require golang.org/x/mod v0.20.0