[RELEASE-1.11] Move to Golang version 1.21 (#546) (#592)

* move to 1.21 * fix actions * update perf tests patch * fix multi-arch
openshift-knative · Jan 18, 2024 · f2b8975 · f2b8975
1 parent d1ff617
commit f2b8975
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/multiarch-build.yaml b/.github/workflows/multiarch-build.yaml
@@ -8,3 +8,5 @@ jobs:
   multiarch-build:
     uses: openshift-knative/hack/.github/workflows/multiarch-build.yaml@main
     secrets: inherit
+    with:
+      goversion: '1.21.x'
diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -48,10 +48,10 @@ jobs:
     env:
       GOPATH: ${{ github.workspace }}
     steps:
-      - name: Set up Go 1.19.x
+      - name: Set up Go 1.21.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
 
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/vulncheck.yaml b/.github/workflows/vulncheck.yaml
@@ -19,10 +19,10 @@ jobs:
     env:
       GOPATH: ${{ github.workspace }}
     steps:
-      - name: Set up Go 1.18.x
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21.x
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: 1.21.x
 
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/openshift/ci-operator/Dockerfile.in b/openshift/ci-operator/Dockerfile.in
@@ -1,5 +1,5 @@
 # Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder
 
 COPY . .
 RUN make install test-install

diff --git a/openshift/ci-operator/Dockerfile_with_kodata.in b/openshift/ci-operator/Dockerfile_with_kodata.in
@@ -1,5 +1,5 @@
 # Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder
 
 COPY . .
 RUN make install test-install

diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile
@@ -1,6 +1,6 @@
 # Dockerfile to bootstrap build and test in openshift-ci
 
-FROM registry.ci.openshift.org/openshift/release:golang-1.19
+FROM registry.ci.openshift.org/openshift/release:golang-1.21
 
 # Add kubernetes repository
 ADD openshift/ci-operator/build-image/kubernetes.repo /etc/yum.repos.d/

diff --git a/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile b/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile
@@ -1,5 +1,5 @@
 # Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder
 
 COPY . .
 

diff --git a/openshift/ci-operator/knative-perf-images/load-test/Dockerfile b/openshift/ci-operator/knative-perf-images/load-test/Dockerfile
@@ -1,5 +1,5 @@
 # Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder
 
 COPY . .
 

diff --git a/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile b/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile
@@ -1,5 +1,5 @@
 # Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder
 
 COPY . .
 

diff --git a/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile b/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile
@@ -1,5 +1,5 @@
 # Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder
 
 COPY . .
 

diff --git a/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile b/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile
@@ -1,5 +1,5 @@
 # Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder
 
 COPY . .
 

diff --git a/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile b/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile
@@ -1,5 +1,5 @@
 # Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder
 
 COPY . .
 

diff --git a/openshift/performance/patches/perf.patch b/openshift/performance/patches/perf.patch
@@ -54,8 +54,8 @@ index 32b94bfb1..ce192d43d 100644
 --- a/openshift/ci-operator/Dockerfile.in
 +++ b/openshift/ci-operator/Dockerfile.in
 @@ -2,7 +2,7 @@
- FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
- 
+ FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder
+
  COPY . .
 -RUN make install test-install
 +RUN make install test-install perf-install
@@ -67,8 +67,8 @@ index 00de72095..0422ce541 100644
 --- a/openshift/ci-operator/Dockerfile_with_kodata.in
 +++ b/openshift/ci-operator/Dockerfile_with_kodata.in
 @@ -2,7 +2,7 @@
- FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
- 
+ FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder
+
  COPY . .
 -RUN make install test-install
 +RUN make install test-install perf-install