bump Golang to 1.19 kubernetes#8932 (kubernetes#8970)

* fix: convert to LF line endings Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com> * Pin exact Go bugfix versions for CI jobs Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com> * Bump go.mod and Dockerfiles to Go 1.19.0 Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com> Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>
joomcode · May 17, 2023 · c3d34a1 · c3d34a1
1 parent d6327eb
commit c3d34a1
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 42 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -70,11 +70,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
 
-      - name: Set up Go 1.18
+      - name: Set up Go 1.19.0
         id: go
         uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a # v3.2.0
         with:
-          go-version: '1.18.2'
+          go-version: '1.19.0'
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 #v2.0.0
@@ -136,7 +136,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a # v3.2.0
         with:
-          go-version: '1.18.2'
+          go-version: '1.19.0'
 
       - name: cache
         uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 # v3
@@ -406,12 +406,12 @@ jobs:
           version: v0.14.0
           image: kindest/node:v1.21.12
 
-      - name: Set up Go 1.18
+      - name: Set up Go 1.19.0
         id: go
         if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}
         uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a # v3.2.0
         with:
-          go-version: '1.18.2'
+          go-version: '1.19.0'
 
       - name: kube-webhook-certgen image build
         if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}

diff --git a/.github/workflows/plugin.yaml b/.github/workflows/plugin.yaml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 # v3.2.0
         with:
-          go-version: 1.18
+          go-version: 1.19.0
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef # v3.0.0

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/ingress-nginx
 
-go 1.18
+go 1.19
 
 require (
 	github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a

diff --git a/images/custom-error-pages/rootfs/Dockerfile b/images/custom-error-pages/rootfs/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.18.2-alpine as builder
+FROM golang:1.19.0-alpine as builder
 RUN apk add git
 
 WORKDIR /go/src/k8s.io/ingress-nginx/images/custom-error-pages

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.18
+go 1.19
 
 require github.com/prometheus/client_golang v1.11.0
 

diff --git a/images/ext-auth-example-authsvc/rootfs/Dockerfile b/images/ext-auth-example-authsvc/rootfs/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18.2-alpine3.15 as builder
+FROM golang:1.19.0-alpine3.16 as builder
 RUN mkdir /authsvc
 WORKDIR /authsvc
 COPY . ./

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.18
+go 1.19
 
 require k8s.io/apimachinery v0.23.1
 

diff --git a/images/kube-webhook-certgen/rootfs/Dockerfile b/images/kube-webhook-certgen/rootfs/Dockerfile
@@ -1,29 +1,29 @@
-# Copyright 2021 The Kubernetes Authors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM --platform=$BUILDPLATFORM golang:1.18.2 as builder
-ARG BUILDPLATFORM
-ARG TARGETARCH
-
-WORKDIR /workspace
-COPY . .
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} go build -a -o kube-webhook-certgen main.go
-
-FROM --platform=$BUILDPLATFORM gcr.io/distroless/static:nonroot
-ARG BUILDPLATFORM
-ARG TARGETARCH
-WORKDIR /
-COPY --from=builder /workspace/kube-webhook-certgen /kube-webhook-certgen
-USER 65532:65532
-ENTRYPOINT ["/kube-webhook-certgen"]
+# Copyright 2021 The Kubernetes Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM --platform=$BUILDPLATFORM golang:1.19.0 as builder
+ARG BUILDPLATFORM
+ARG TARGETARCH
+
+WORKDIR /workspace
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} go build -a -o kube-webhook-certgen main.go
+
+FROM --platform=$BUILDPLATFORM gcr.io/distroless/static:nonroot
+ARG BUILDPLATFORM
+ARG TARGETARCH
+WORKDIR /
+COPY --from=builder /workspace/kube-webhook-certgen /kube-webhook-certgen
+USER 65532:65532
+ENTRYPOINT ["/kube-webhook-certgen"]
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.18
+go 1.19
 
 require (
 	github.com/onrik/logrus v0.9.0

diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile
@@ -39,7 +39,7 @@ build: ensure-buildx
 		--progress=$(PROGRESS) \
 		--pull \
 		--build-arg BASE_IMAGE=$(NGINX_BASE_IMAGE) \
-		--build-arg GOLANG_VERSION=1.18.2 \
+		--build-arg GOLANG_VERSION=1.19.0 \
 		--build-arg ETCD_VERSION=3.4.3-0 \
 		--build-arg K8S_RELEASE=v1.24.2 \
 		--build-arg RESTY_CLI_VERSION=0.27 \