Upgrade golang to 1.22.2 for v2.25 release branch (#6650)

Signed-off-by: Akash Gautam <gautamakash04@gmail.com>
kubermatic · Apr 15, 2024 · b974b1b · b974b1b
1 parent 4b3c0d7
commit b974b1b
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/.prow/api.yaml b/.prow/api.yaml
@@ -32,7 +32,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5
+        - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.22-3
           command:
             - "./hack/ci/run-api-e2e.sh"
           env:
@@ -60,7 +60,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.22-node-18-5
+        - image: quay.io/kubermatic/build:go-1.22-node-20-3
           command:
             - make
           args:
@@ -81,7 +81,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.22-node-18-5
+        - image: quay.io/kubermatic/build:go-1.22-node-20-3
           command:
             - make
             - api-lint
@@ -101,7 +101,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.22-node-18-5
+        - image: quay.io/kubermatic/build:go-1.22-node-20-3
           command:
             - make
             - api-verify

diff --git a/.prow/common.yaml b/.prow/common.yaml
@@ -21,7 +21,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5
+        - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.22-3
           command:
             - ./hack/ci/verify.sh
           resources:

diff --git a/.prow/frontend.yaml b/.prow/frontend.yaml
@@ -215,7 +215,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5
+        - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.22-3
           command:
             - make
             - web-check-dependencies
@@ -231,7 +231,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.22-node-18-5
+        - image: quay.io/kubermatic/build:go-1.22-node-20-3
           command:
             - make
             - web-lint
@@ -251,7 +251,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5
+        - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.22-3
           command:
             - make
             - web-check

diff --git a/hack/verify-spelling.sh b/hack/verify-spelling.sh
@@ -19,7 +19,7 @@ set -euo pipefail
 cd $(dirname $0)/..
 source hack/lib.sh
 
-CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-18-5 containerize ./hack/verify-spelling.sh
+CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-20-3 containerize ./hack/verify-spelling.sh
 
 echodate "Running codespell..."
 

diff --git a/modules/api/.golangci.yml b/modules/api/.golangci.yml
@@ -14,7 +14,7 @@
 
 run:
   modules-download-mode: readonly
-  deadline: 20m
+  timeout: 20m
   build-tags:
     - ce
     - cloud
@@ -26,10 +26,6 @@ run:
     - ipam
     - kubevirt
     - logout
-  skip-files:
-    # This package was forked from upstream (in #9826)
-    # and we want to keep it as close to upstream as possible.
-    - modules/api/pkg/provider/cloud/eks/authenticator
 
 linters:
   enable:
@@ -81,6 +77,10 @@ issues:
     - loop variable tc captured by func literal
     # TODO (sig-api): fix the following issues
     - cfg.EndpointResolverWithOptions is deprecated
+  exclude-files:
+    # This package was forked from upstream (in #9826)
+    # and we want to keep it as close to upstream as possible.
+    - modules/api/pkg/provider/cloud/eks/authenticator
 
 linters-settings:
   depguard:

diff --git a/modules/api/hack/gen-api-client.sh b/modules/api/hack/gen-api-client.sh
@@ -24,7 +24,7 @@ source hack/lib.sh
 
 API=modules/api
 
-CONTAINERIZE_IMAGE=golang:1.22.1 containerize ./modules/api/hack/gen-api-client.sh
+CONTAINERIZE_IMAGE=golang:1.22.2 containerize ./modules/api/hack/gen-api-client.sh
 
 cd $API/cmd/kubermatic-api/
 SWAGGER_FILE="swagger.json"

diff --git a/modules/api/hack/update-swagger.sh b/modules/api/hack/update-swagger.sh
@@ -21,7 +21,7 @@ source hack/lib.sh
 
 API=modules/api
 
-CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-18-5 containerize ./$API/hack/update-swagger.sh
+CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-20-3 containerize ./$API/hack/update-swagger.sh
 
 echodate "Generating swagger spec"
 cd $API/cmd/kubermatic-api/

diff --git a/modules/api/hack/verify-licenses.sh b/modules/api/hack/verify-licenses.sh
@@ -21,7 +21,7 @@ source hack/lib.sh
 
 API=modules/api
 
-CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-18-5 containerize ./$API/hack/verify-licenses.sh
+CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-20-3 containerize ./$API/hack/verify-licenses.sh
 
 cd $API
 go mod vendor

diff --git a/modules/web/containers/chrome-headless/Dockerfile b/modules/web/containers/chrome-headless/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5
+FROM quay.io/kubermatic/build:go-1.22-node-20-kind-0.22-3
 
 LABEL maintainer="support@kubermatic.com"
 

diff --git a/modules/web/containers/custom-dashboard/Dockerfile b/modules/web/containers/custom-dashboard/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5
+FROM quay.io/kubermatic/build:go-1.22-node-20-kind-0.22-3
 LABEL maintainer="support@kubermatic.com"
 
 ENV NG_CLI_ANALYTICS=ci