Go: Bump to v1.22.5.

kubernetes · Aug 5, 2024 · fe335ac · fe335ac
1 parent 2e3c2c1
commit fe335ac
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 17 deletions.
diff --git a/GOLANG_VERSION b/GOLANG_VERSION
@@ -1 +1 @@
-1.22.4
+1.22.5
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module k8s.io/ingress-nginx
 
-go 1.22.0
-
-toolchain go1.22.4
+go 1.22.5
 
 require (
 	dario.cat/mergo v1.0.0

diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.22.0
+go 1.22.5
 
 use (
 	.

diff --git a/images/custom-error-pages/rootfs/go.mod b/images/custom-error-pages/rootfs/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/ingress-nginx/custom-error-pages
 
-go 1.21
+go 1.22.5
 
 require github.com/prometheus/client_golang v1.11.1
 

diff --git a/images/ext-auth-example-authsvc/rootfs/Dockerfile b/images/ext-auth-example-authsvc/rootfs/Dockerfile
@@ -1,6 +1,6 @@
 ARG GOLANG_VERSION
 
-FROM golang:${GOLANG_VERSION}-alpine3.18 as builder
+FROM golang:${GOLANG_VERSION}-alpine3.20 as builder
 RUN mkdir /authsvc
 WORKDIR /authsvc
 COPY . ./
@@ -9,4 +9,4 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o authsvc authsvc.go
 FROM gcr.io/distroless/base-debian11
 COPY --from=builder /authsvc/authsvc /
 EXPOSE 8080
-ENTRYPOINT ["/authsvc"]
+ENTRYPOINT ["/authsvc"]
diff --git a/images/ext-auth-example-authsvc/rootfs/go.mod b/images/ext-auth-example-authsvc/rootfs/go.mod
@@ -1,6 +1,6 @@
 module example.com/authsvc
 
-go 1.21
+go 1.22.5
 
 require k8s.io/apimachinery v0.23.1
 

diff --git a/images/fastcgi-helloserver/rootfs/Dockerfile b/images/fastcgi-helloserver/rootfs/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 ARG GOLANG_VERSION
 
-FROM golang:${GOLANG_VERSION}-alpine3.18 as builder
+FROM golang:${GOLANG_VERSION}-alpine3.20 as builder
 
 WORKDIR /go/src/k8s.io/ingress-nginx/images/fastcgi
 
@@ -30,4 +30,4 @@ FROM gcr.io/distroless/static:nonroot
 COPY --from=builder /go/src/k8s.io/ingress-nginx/images/fastcgi/fastcgi-helloserver /
 USER nonroot:nonroot
 
-CMD ["/fastcgi-helloserver"]
+CMD ["/fastcgi-helloserver"]
diff --git a/images/go-grpc-greeter-server/rootfs/Dockerfile b/images/go-grpc-greeter-server/rootfs/Dockerfile
@@ -1,6 +1,6 @@
 ARG GOLANG_VERSION
 
-FROM golang:${GOLANG_VERSION}-alpine3.18 as build
+FROM golang:${GOLANG_VERSION}-alpine3.20 as build
 
 WORKDIR /go/src/greeter-server
 
@@ -15,4 +15,4 @@ COPY --from=build /greeter-server /
 
 EXPOSE 50051
 
-CMD ["/greeter-server"]
+CMD ["/greeter-server"]
diff --git a/images/kube-webhook-certgen/rootfs/go.mod b/images/kube-webhook-certgen/rootfs/go.mod
@@ -1,6 +1,6 @@
 module github.com/jet/kube-webhook-certgen
 
-go 1.21
+go 1.22.5
 
 require (
 	github.com/onrik/logrus v0.11.0

diff --git a/images/opentelemetry/rootfs/Dockerfile b/images/opentelemetry/rootfs/Dockerfile
@@ -31,7 +31,7 @@ FROM base as nginx
 ARG NGINX_VERSION=1.25.3
 RUN bash /opt/third_party/build.sh -n ${NGINX_VERSION}
 
-FROM golang:1.21.6-bullseye as build-init
+FROM golang:1.22.5-bullseye as build-init
 
 WORKDIR /go/src/app
 COPY . .

diff --git a/images/opentelemetry/rootfs/go.mod b/images/opentelemetry/rootfs/go.mod
@@ -1,3 +1,3 @@
 module init-otel
 
-go 1.21
+go 1.22.5
diff --git a/magefiles/go.mod b/magefiles/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/ingress-nginx/magefiles
 
-go 1.21
+go 1.22.5
 
 require (
 	github.com/blang/semver/v4 v4.0.0