diff --git a/.github/workflows/multiarch-build.yaml b/.github/workflows/multiarch-build.yaml index 4fec998ff838..90bb4ea2f9d8 100644 --- 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 index e565ac97d316..8d91016a0738 100644 --- 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 index e546ddfb39df..7b59589f5cf1 100644 --- 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 index 32b94bfb199c..f56da1178789 100644 --- 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 index 00de7209562b..e623a5eae3e3 100644 --- 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 index 4403c7c99fcb..8ddd9839a436 100644 --- 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 index 38e7b864a153..97a3f4db019a 100644 --- 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 index cc7935e16892..b0bd55a48ed6 100644 --- 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 index ac4d4f898932..f72c0cacc6a8 100644 --- 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 index 7d6f3c0bf0d1..c878975290b2 100644 --- 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 index f371afab48e2..d26d71189ce3 100644 --- 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 index 1b331b140ed4..cbf8cc4aaf90 100644 --- 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 index 09470e3b5bd4..e47d31a7e6c1 100644 --- 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