From ef74f46e560c035b19a3a2d0244fb1152856fc4e Mon Sep 17 00:00:00 2001 From: Praveen Kumar Date: Tue, 19 Aug 2025 14:23:49 +0530 Subject: [PATCH 1/3] CI: Update images from rhel-8-release-golang tag to rhel-9-release-golang By default crc support 2 major release so better to update the images to rhel-9 since rhel-10 is released and available from quite some time. --- .devcontainer/devcontainer.json | 2 +- .github/workflows/verify-devcontainer.yml | 2 +- images/build-e2e/Containerfile | 2 +- images/build-integration/Containerfile | 2 +- images/build/Dockerfile | 4 ++-- images/openshift-ci/Dockerfile | 2 +- update-go-version.sh | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 648befc18a..35807af846 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "CRC environment", - "image": "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19", + "image": "registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19", "customizations": { "vscode": { diff --git a/.github/workflows/verify-devcontainer.yml b/.github/workflows/verify-devcontainer.yml index 0c570f998f..d34b2f11d5 100644 --- a/.github/workflows/verify-devcontainer.yml +++ b/.github/workflows/verify-devcontainer.yml @@ -8,7 +8,7 @@ jobs: verify-devcontainer: runs-on: ubuntu-24.04 container: - image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 + image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 options: --cpus 4 steps: - name: Run `git clone` diff --git a/images/build-e2e/Containerfile b/images/build-e2e/Containerfile index 44c4260660..f543a330b5 100644 --- a/images/build-e2e/Containerfile +++ b/images/build-e2e/Containerfile @@ -1,5 +1,5 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder USER root diff --git a/images/build-integration/Containerfile b/images/build-integration/Containerfile index 067479d7c8..a3ea347311 100644 --- a/images/build-integration/Containerfile +++ b/images/build-integration/Containerfile @@ -1,5 +1,5 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder USER root diff --git a/images/build/Dockerfile b/images/build/Dockerfile index e35b061fb4..601a679072 100644 --- a/images/build/Dockerfile +++ b/images/build/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder MAINTAINER CRC WORKDIR /opt/src @@ -6,4 +6,4 @@ COPY . . RUN make cross FROM registry.access.redhat.com/ubi9/ubi -COPY --from=builder /opt/src/out/ /opt/ \ No newline at end of file +COPY --from=builder /opt/src/out/ /opt/ diff --git a/images/openshift-ci/Dockerfile b/images/openshift-ci/Dockerfile index 97cf7675c5..1662a3c800 100644 --- a/images/openshift-ci/Dockerfile +++ b/images/openshift-ci/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile is used by openshift CI # It builds an image containing crc and nss-wrapper for remote deployments, as well as the google cloud-sdk for nested GCE environments. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder WORKDIR /go/src/github.com/crc-org/crc COPY . . RUN make release diff --git a/update-go-version.sh b/update-go-version.sh index 9ef2d4cfd8..620602e484 100755 --- a/update-go-version.sh +++ b/update-go-version.sh @@ -13,9 +13,9 @@ go mod edit -go "${golang_base_version}.0" go mod edit -go "${golang_base_version}.1" tools/go.mod sed -i "s,^GOVERSION = 1.[0-9]\+,GOVERSION = ${golang_base_version}," Makefile -sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Dockerfile -sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Containerfile -sed -i "s,\(registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," .devcontainer/devcontainer.json +sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Dockerfile +sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Containerfile +sed -i "s,\(registry.ci.openshift.org/openshift/release:rhel-9-release-golang-\)1.[0-9]\+,\1${golang_base_version}," .devcontainer/devcontainer.json for f in .github/workflows/*.yml; do if [ $(yq eval '.jobs.build.strategy.matrix | has("go")' "$f") == "true" ]; then yq eval --inplace ".jobs.build.strategy.matrix.go[0] = ${golang_base_version} | .jobs.build.strategy.matrix.go[0] style=\"single\"" "$f"; @@ -25,4 +25,4 @@ for f in .github/workflows/*.yml; do fi done # Use sed for verify-devcontainer because image is from registry.ci.openshift -sed -i "s,\(registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," .github/workflows/verify-devcontainer.yml +sed -i "s,\(registry.ci.openshift.org/openshift/release:rhel-9-release-golang-\)1.[0-9]\+,\1${golang_base_version}," .github/workflows/verify-devcontainer.yml From 1ccc477bc4960f3d5c292e8aa4bbe4a2ea9f9a31 Mon Sep 17 00:00:00 2001 From: Praveen Kumar Date: Wed, 20 Aug 2025 12:07:41 +0530 Subject: [PATCH 2/3] CI: update image registry tag from 4.19 to 4.20 Looks like openshift-4.19 doesn't have tag for golang-1.24 but openshift 4.20 have it for both 1.23 and 1.24 `registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20` since plan is to update the golang version to 1.24 in following commit so switching to 4.20 --- .devcontainer/devcontainer.json | 2 +- .github/workflows/verify-devcontainer.yml | 2 +- images/build-e2e/Containerfile | 2 +- images/build-integration/Containerfile | 2 +- images/build/Dockerfile | 2 +- images/openshift-ci/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 35807af846..f0495fee1e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "CRC environment", - "image": "registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19", + "image": "registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20", "customizations": { "vscode": { diff --git a/.github/workflows/verify-devcontainer.yml b/.github/workflows/verify-devcontainer.yml index d34b2f11d5..4e9022a396 100644 --- a/.github/workflows/verify-devcontainer.yml +++ b/.github/workflows/verify-devcontainer.yml @@ -8,7 +8,7 @@ jobs: verify-devcontainer: runs-on: ubuntu-24.04 container: - image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 + image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20 options: --cpus 4 steps: - name: Run `git clone` diff --git a/images/build-e2e/Containerfile b/images/build-e2e/Containerfile index f543a330b5..7005bf827e 100644 --- a/images/build-e2e/Containerfile +++ b/images/build-e2e/Containerfile @@ -1,5 +1,5 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20 AS builder USER root diff --git a/images/build-integration/Containerfile b/images/build-integration/Containerfile index a3ea347311..f1fd43c380 100644 --- a/images/build-integration/Containerfile +++ b/images/build-integration/Containerfile @@ -1,5 +1,5 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20 AS builder USER root diff --git a/images/build/Dockerfile b/images/build/Dockerfile index 601a679072..b1082fcacb 100644 --- a/images/build/Dockerfile +++ b/images/build/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20 AS builder MAINTAINER CRC WORKDIR /opt/src diff --git a/images/openshift-ci/Dockerfile b/images/openshift-ci/Dockerfile index 1662a3c800..c2fdfe8cc9 100644 --- a/images/openshift-ci/Dockerfile +++ b/images/openshift-ci/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile is used by openshift CI # It builds an image containing crc and nss-wrapper for remote deployments, as well as the google cloud-sdk for nested GCE environments. -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20 AS builder WORKDIR /go/src/github.com/crc-org/crc COPY . . RUN make release From ad0ce65f3cc3778606c661abb5a5ca346b1fe60f Mon Sep 17 00:00:00 2001 From: Praveen Kumar Date: Wed, 20 Aug 2025 12:14:29 +0530 Subject: [PATCH 3/3] Update golang version to 1.24 Since 1.25 is released and now most of the dep modules are switching to use 1.24 in the mod file since 1.23 is EOL https://endoflife.date/go --- .devcontainer/devcontainer.json | 2 +- .github/workflows/choco-release.yml | 2 +- .github/workflows/macos-installer.yml | 2 +- .github/workflows/make-check-win.yml | 2 +- .github/workflows/make-check.yml | 2 +- .github/workflows/make-rpm.yml | 2 +- .github/workflows/qe-image.yml | 2 +- .github/workflows/test-okd-bundle.yml | 2 +- .github/workflows/verify-devcontainer.yml | 2 +- .github/workflows/windows-artifacts.yml | 2 +- .github/workflows/windows-chocolatey.yml | 2 +- Makefile | 2 +- go.mod | 2 +- images/build-e2e/Containerfile | 2 +- images/build-integration/Containerfile | 2 +- images/build/Dockerfile | 2 +- images/openshift-ci/Dockerfile | 2 +- tools/go.mod | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f0495fee1e..2d256c6f7a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "CRC environment", - "image": "registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20", + "image": "registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20", "customizations": { "vscode": { diff --git a/.github/workflows/choco-release.yml b/.github/workflows/choco-release.yml index 40190224a9..413501bfe7 100644 --- a/.github/workflows/choco-release.yml +++ b/.github/workflows/choco-release.yml @@ -13,7 +13,7 @@ jobs: os: - windows-2022 go: - - '1.23' + - '1.24' steps: - name: Check out repository code uses: actions/checkout@v5 diff --git a/.github/workflows/macos-installer.yml b/.github/workflows/macos-installer.yml index 83e5e9ea77..16037d2c31 100644 --- a/.github/workflows/macos-installer.yml +++ b/.github/workflows/macos-installer.yml @@ -20,7 +20,7 @@ jobs: - macOS-13 - macOS-14 go: - - '1.23' + - '1.24' steps: # Enable tmate debugging of manually-triggered workflows if the input option was provided - name: Setup tmate session diff --git a/.github/workflows/make-check-win.yml b/.github/workflows/make-check-win.yml index a28cfa7419..2539cd9ea2 100644 --- a/.github/workflows/make-check-win.yml +++ b/.github/workflows/make-check-win.yml @@ -13,7 +13,7 @@ jobs: os: - windows-2022 go: - - '1.23' + - '1.24' steps: - name: Check out repository code uses: actions/checkout@v5 diff --git a/.github/workflows/make-check.yml b/.github/workflows/make-check.yml index ecece610c7..1f6e06522c 100644 --- a/.github/workflows/make-check.yml +++ b/.github/workflows/make-check.yml @@ -16,7 +16,7 @@ jobs: - ubuntu-latest - ubuntu-22.04 go: - - '1.23' + - '1.24' steps: - name: Check out repository code uses: actions/checkout@v5 diff --git a/.github/workflows/make-rpm.yml b/.github/workflows/make-rpm.yml index 7e3a3ef7be..6f9408fdb5 100644 --- a/.github/workflows/make-rpm.yml +++ b/.github/workflows/make-rpm.yml @@ -13,7 +13,7 @@ jobs: os: - ubuntu-latest go: - - '1.23' + - '1.24' steps: - name: Check out repository code uses: actions/checkout@v5 diff --git a/.github/workflows/qe-image.yml b/.github/workflows/qe-image.yml index 88e0499040..6b5e5a4c45 100644 --- a/.github/workflows/qe-image.yml +++ b/.github/workflows/qe-image.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: go: - - '1.23' + - '1.24' os: ['linux', 'windows', 'darwin'] arch: ['amd64', 'arm64'] exclude: diff --git a/.github/workflows/test-okd-bundle.yml b/.github/workflows/test-okd-bundle.yml index 3600b43a2f..bf265984db 100644 --- a/.github/workflows/test-okd-bundle.yml +++ b/.github/workflows/test-okd-bundle.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: go: - - '1.23' + - '1.24' env: SHELL: /bin/bash KUBECONFIG: '/Users/runner/.kube/config' diff --git a/.github/workflows/verify-devcontainer.yml b/.github/workflows/verify-devcontainer.yml index 4e9022a396..795e68048d 100644 --- a/.github/workflows/verify-devcontainer.yml +++ b/.github/workflows/verify-devcontainer.yml @@ -8,7 +8,7 @@ jobs: verify-devcontainer: runs-on: ubuntu-24.04 container: - image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20 + image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 options: --cpus 4 steps: - name: Run `git clone` diff --git a/.github/workflows/windows-artifacts.yml b/.github/workflows/windows-artifacts.yml index 7a0974270c..3e557553cd 100644 --- a/.github/workflows/windows-artifacts.yml +++ b/.github/workflows/windows-artifacts.yml @@ -22,7 +22,7 @@ jobs: fail-fast: false matrix: os: ['windows-2022'] - go: ['1.23'] + go: ['1.24'] steps: - name: Check out repository code uses: actions/checkout@v5 diff --git a/.github/workflows/windows-chocolatey.yml b/.github/workflows/windows-chocolatey.yml index ecda6b23f8..9d0b26bbd9 100644 --- a/.github/workflows/windows-chocolatey.yml +++ b/.github/workflows/windows-chocolatey.yml @@ -13,7 +13,7 @@ jobs: os: - windows-2022 go: - - '1.23' + - '1.24' steps: - name: Check out repository code uses: actions/checkout@v5 diff --git a/Makefile b/Makefile index 2a5c7431aa..f1f4b926b1 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ RELEASE_DIR ?= release GOOS ?= $(shell go env GOOS) GOARCH ?= $(shell go env GOARCH) -GOVERSION = 1.23 +GOVERSION = 1.24 HOST_BUILD_DIR=$(BUILD_DIR)/$(GOOS)-$(GOARCH) GOPATH ?= $(shell go env GOPATH) diff --git a/go.mod b/go.mod index b42cfa4dad..c69cb1333a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/crc-org/crc/v2 -go 1.23.0 +go 1.24.0 require ( github.com/AlecAivazis/survey/v2 v2.3.7 diff --git a/images/build-e2e/Containerfile b/images/build-e2e/Containerfile index 7005bf827e..271900b7d6 100644 --- a/images/build-e2e/Containerfile +++ b/images/build-e2e/Containerfile @@ -1,5 +1,5 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 AS builder USER root diff --git a/images/build-integration/Containerfile b/images/build-integration/Containerfile index f1fd43c380..fe299d0633 100644 --- a/images/build-integration/Containerfile +++ b/images/build-integration/Containerfile @@ -1,5 +1,5 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 AS builder USER root diff --git a/images/build/Dockerfile b/images/build/Dockerfile index b1082fcacb..f4183550a4 100644 --- a/images/build/Dockerfile +++ b/images/build/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 AS builder MAINTAINER CRC WORKDIR /opt/src diff --git a/images/openshift-ci/Dockerfile b/images/openshift-ci/Dockerfile index c2fdfe8cc9..ec19d2e447 100644 --- a/images/openshift-ci/Dockerfile +++ b/images/openshift-ci/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile is used by openshift CI # It builds an image containing crc and nss-wrapper for remote deployments, as well as the google cloud-sdk for nested GCE environments. -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 AS builder WORKDIR /go/src/github.com/crc-org/crc COPY . . RUN make release diff --git a/tools/go.mod b/tools/go.mod index 99f67ac2a8..4ff79dffb8 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/crc-org/crc/tools -go 1.23.1 +go 1.24.1 require ( github.com/cfergeau/gomod2rpmdeps v0.0.0-20210223144124-2042c4850ca8