Merge pull request openshift#7925 from r4f4/bump-golang-1.21

patrickdillon · web-flow · commit 2d25434eda50 · 2024-01-31T12:07:22.000-05:00
OCPBUGS-27263: Bump golang 1.21
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.20-openshift-4.16
+  tag: rhel-8-release-golang-1.21-openshift-4.16
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -9,7 +9,7 @@ run:
   - ^scripts
   - ^terraform
   - ^upi
-  go: '1.20'
+  go: '1.21'
   modules-download-mode: vendor
   allow-parallel-runners: true
 output:
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/installer
 
-go 1.20
+go 1.21
 
 require (
 	cloud.google.com/go/monitoring v1.15.1
diff --git a/go.sum b/go.sum
diff --git a/hack/build.sh b/hack/build.sh
@@ -61,7 +61,7 @@ build_terraform_and_providers() {
 	fi
 }
 
-minimum_go_version=1.20
+minimum_go_version=1.21
 current_go_version=$(go version | cut -d " " -f 3)
 
 if [ "$(version "${current_go_version#go}")" -lt "$(version "$minimum_go_version")" ]; then
diff --git a/hack/go-fmt.sh b/hack/go-fmt.sh
@@ -11,6 +11,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
     --workdir /go/src/github.com/openshift/installer \
-    docker.io/golang:1.19 \
+    docker.io/golang:1.21 \
     ./hack/go-fmt.sh "${@}"
 fi
diff --git a/hack/go-genmock.sh b/hack/go-genmock.sh
@@ -10,6 +10,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
     --workdir /go/src/github.com/openshift/installer \
-    docker.io/golang:1.18 \
+    docker.io/golang:1.21 \
     ./hack/go-genmock.sh "${@}"
 fi
diff --git a/hack/go-sec.sh b/hack/go-sec.sh
@@ -12,6 +12,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
     --workdir /go/src/github.com/openshift/installer \
-    docker.io/golang:1.20 \
+    docker.io/golang:1.21 \
     ./hack/go-sec.sh "${@}"
 fi
diff --git a/hack/go-test.sh b/hack/go-test.sh
@@ -8,6 +8,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
     --workdir /go/src/github.com/openshift/installer \
-    docker.io/golang:1.20 \
+    docker.io/golang:1.21 \
     ./hack/go-test.sh "${@}"
 fi
diff --git a/hack/go-vet.sh b/hack/go-vet.sh
@@ -6,6 +6,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
     --workdir /go/src/github.com/openshift/installer \
-    docker.io/golang:1.20 \
+    docker.io/golang:1.21 \
     ./hack/go-vet.sh "${@}"
 fi;
diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh
@@ -10,6 +10,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
     --workdir /go/src/github.com/openshift/installer \
-    docker.io/golang:1.18 \
+    docker.io/golang:1.21 \
     ./hack/verify-codegen.sh "${@}"
 fi
diff --git a/hack/verify-vendor.sh b/hack/verify-vendor.sh
@@ -20,11 +20,9 @@ if [ "$IS_CONTAINER" != "" ]; then
   verify_module "${PWD}"
 
   # Verify the sub-modules for the terraform providers.
-  # The -compat=1.18 is needed for the openstack provider. The provider uses golang.org/x/mod, which go 1.18 selects
-  # as v0.3.0 but go 1.16 selects as v0.4.2.
   find terraform/providers -maxdepth 1 -mindepth 1 -print0 | while read -r -d '' dir
   do
-    verify_module "$dir" "1.18"
+    verify_module "$dir"
   done
   # Verify the terraform sub-module.
   verify_module "terraform/terraform"
@@ -41,6 +39,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/github.com/openshift/installer:z" \
     --workdir /go/src/github.com/openshift/installer \
-    docker.io/golang:1.20 \
+    docker.io/golang:1.21 \
     ./hack/verify-vendor.sh "${@}"
 fi
diff --git a/images/baremetal/Dockerfile.ci b/images/baremetal/Dockerfile.ci
@@ -5,7 +5,7 @@ ARG libvirt_version="8.0.0"
 
 FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers AS providers
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG libvirt_version
 ARG TAGS="libvirt baremetal"
 RUN dnf install -y libvirt-devel-$libvirt_version && \
diff --git a/images/infrastructure-providers/Dockerfile b/images/infrastructure-providers/Dockerfile
@@ -1,24 +1,24 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS macbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS macbuilder
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 RUN CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 make -C terraform
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS macarmbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS macarmbuilder
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 RUN CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 make -C terraform
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS linuxbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS linuxbuilder
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make -C terraform
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS linuxarmbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS linuxarmbuilder
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 make -C terraform
 
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.16:base
 WORKDIR /go/src/github.com/openshift/installer
 COPY --from=macbuilder /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
 COPY --from=macarmbuilder /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
diff --git a/images/installer-altinfra/Dockerfile.ci b/images/installer-altinfra/Dockerfile.ci
@@ -7,7 +7,7 @@
 # solutions. Once all providers have alternate implementations, this image will
 # not be needed. 
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS="altinfra"
 ARG OPENSHIFT_INSTALL_CLUSTER_API=""
 WORKDIR /go/src/github.com/openshift/installer
diff --git a/images/installer-artifacts/Dockerfile.rhel b/images/installer-artifacts/Dockerfile.rhel
@@ -3,35 +3,35 @@
 
 FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers AS providers
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS macbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS macbuilder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/darwin_amd64 terraform/bin/darwin_amd64
 RUN GOOS=darwin GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS macarmbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS macarmbuilder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/darwin_arm64 terraform/bin/darwin_arm64
 RUN GOOS=darwin GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS linuxbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS linuxbuilder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/linux_amd64 terraform/bin/linux_amd64
 RUN GOOS=linux GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS linuxarmbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS linuxarmbuilder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/linux_arm64 terraform/bin/linux_arm64
 RUN GOOS=linux GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
diff --git a/images/installer/Dockerfile.ci b/images/installer/Dockerfile.ci
@@ -3,7 +3,7 @@
 
 FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers AS providers
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci
@@ -2,21 +2,21 @@
 # It builds an image containing binaries like jq, terraform, awscli, oc, etc. to allow bringing up UPI infrastructure.
 # It also contains the `upi` directory that contains various terraform and cloud formation templates that are used to create infrastructure resources.
 
-FROM registry.ci.openshift.org/ocp/4.15:installer-terraform-providers as providers
+FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers as providers
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
 RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
 
-FROM registry.ci.openshift.org/ocp/4.15:cli as cli
+FROM registry.ci.openshift.org/ocp/4.16:cli as cli
 FROM quay.io/ocp-splat/govc:v0.30.7 as govc
 FROM quay.io/multi-arch/yq:3.3.0 as yq3
 FROM quay.io/multi-arch/yq:4.30.5 as yq4
 
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.16:base
 COPY --from=cli /usr/bin/oc /bin/oc
 COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
 COPY --from=builder /go/src/github.com/openshift/installer/upi /var/lib/openshift-install/upi
diff --git a/images/libvirt/Dockerfile.ci b/images/libvirt/Dockerfile.ci
@@ -1,9 +1,9 @@
 # This Dockerfile is a used by CI to publish an installer image for creating libvirt clusters
 # It builds an image containing openshift-install and nss-wrapper for remote deployments, as well as the google cloud-sdk for nested GCE environments.
 
-FROM registry.ci.openshift.org/ocp/4.15:installer-terraform-providers as providers
+FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers as providers
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS="libvirt"
 RUN yum install -y libvirt-devel && \
     yum clean all && rm -rf /var/cache/yum/*
diff --git a/images/openstack/Dockerfile.ci b/images/openstack/Dockerfile.ci
@@ -1,17 +1,17 @@
 # This Dockerfile is used by CI to test using OpenShift Installer against an OpenStack cloud.
 # It builds an image containing the openshift-install command as well as the openstack cli.
-FROM registry.ci.openshift.org/ocp/4.15:installer-terraform-providers as providers
+FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers as providers
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
 RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
 
-FROM registry.ci.openshift.org/ocp/4.15:cli AS cli
+FROM registry.ci.openshift.org/ocp/4.16:cli AS cli
 
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.16:base
 COPY --from=cli /usr/bin/oc /bin/oc
 COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
 COPY --from=builder /go/src/github.com/openshift/installer/upi/openstack /var/lib/openshift-install/upi
diff --git a/terraform/Makefile b/terraform/Makefile
@@ -22,10 +22,8 @@ all: go-build
 
 .PHONY: go-mod-tidy-vendor
 go-mod-tidy-vendor: $(GO_MOD_TIDY_TARGETS)
-# The -compat=1.18 is needed for the openstack provider. The provider uses golang.org/x/mod, which go 1.18 selects
-# as v0.3.0 but go 1.16 selects as v0.4.2.
 $(GO_MOD_TIDY_TARGETS): go-mod-tidy-vendor.%:
-	cd providers/$* && go mod tidy -compat=1.18 && go mod vendor
+	cd providers/$* && go mod tidy && go mod vendor
 
 .PHONY: go-build
 go-build: $(GO_BUILD_TARGETS) go-build-terraform

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ build_terraform_and_providers() {`
`61`	`61`	`fi`
`62`	`62`	`}`
`63`	`63`
`64`		`-minimum_go_version=1.20`
	`64`	`+minimum_go_version=1.21`
`65`	`65`	`current_go_version=$(go version \| cut -d " " -f 3)`
`66`	`66`
`67`	`67`	`if [ "$(version "${current_go_version#go}")" -lt "$(version "$minimum_go_version")" ]; then`