From 2bf3df59d0cc50807f96fd77a80c01fec4b69df5 Mon Sep 17 00:00:00 2001 From: Anjan Nath Date: Thu, 30 May 2024 12:41:18 +0530 Subject: [PATCH] update base images for integration and e2e to go-toolset:1.21 this updates the update-go-version.sh script to also updaate go versions in the files images/*/Containerfile fixes #4185 --- images/build-e2e/Containerfile | 2 +- images/build-integration/Containerfile | 2 +- update-go-version.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/build-e2e/Containerfile b/images/build-e2e/Containerfile index 94aaa7634c..9dbe2dd453 100644 --- a/images/build-e2e/Containerfile +++ b/images/build-e2e/Containerfile @@ -1,5 +1,5 @@ -FROM registry.access.redhat.com/ubi8/go-toolset:1.20 AS builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder USER root diff --git a/images/build-integration/Containerfile b/images/build-integration/Containerfile index ca498f963a..e2429f17f8 100644 --- a/images/build-integration/Containerfile +++ b/images/build-integration/Containerfile @@ -1,5 +1,5 @@ -FROM registry.access.redhat.com/ubi8/go-toolset:1.20 AS builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder USER root diff --git a/update-go-version.sh b/update-go-version.sh index a5f2abe41b..4a046dc54d 100755 --- a/update-go-version.sh +++ b/update-go-version.sh @@ -14,6 +14,7 @@ go mod edit -go ${golang_base_version} 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.access.redhat.com/ubi8/go-toolset:[.0-9]\+,FROM registry.access.redhat.com/ubi8/go-toolset:${golang_base_version}," images/*/Dockerfile +sed -i "s,^FROM registry.access.redhat.com/ubi8/go-toolset:[.0-9]\+,FROM registry.access.redhat.com/ubi8/go-toolset:${golang_base_version}," images/*/Containerfile 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";