Upgrade to Go 1.21 (#1440)

Signed-off-by: Douglas Camata <[email protected]>
stolostron · May 18, 2024 · e29ed2a · e29ed2a
1 parent a7fbc97
commit e29ed2a
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 22 deletions.
diff --git a/cicd-scripts/run-e2e-tests.sh b/cicd-scripts/run-e2e-tests.sh
@@ -80,13 +80,13 @@ if command -v ginkgo &>/dev/null; then
 else
   # just for Prow KinD vm
   # uninstall old go version(1.16) and install new version
-  wget -nv https://go.dev/dl/go1.20.4.linux-amd64.tar.gz
+  wget -nv https://go.dev/dl/go1.21.10.linux-amd64.tar.gz
   if command -v sudo >/dev/null 2>&1; then
     sudo rm -fr /usr/local/go
-    sudo tar -C /usr/local -xzf go1.20.4.linux-amd64.tar.gz
+    sudo tar -C /usr/local -xzf go1.21.10.linux-amd64.tar.gz
   # else
   #     rm -fr /usr/local/go
-  #     tar -C /usr/local -xzf go1.20.4.linux-amd64.tar.gz
+  #     tar -C /usr/local -xzf go1.21.10.linux-amd64.tar.gz
   fi
   go install github.com/onsi/ginkgo/ginkgo@latest
   GINKGO_CMD="$(go env GOPATH)/bin/ginkgo"

diff --git a/collectors/metrics/Containerfile.operator b/collectors/metrics/Containerfile.operator
@@ -1,7 +1,7 @@
 # Copyright Contributors to the Open Cluster Management project
 # Licensed under the Apache License 2.0
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./

diff --git a/collectors/metrics/Dockerfile b/collectors/metrics/Dockerfile
@@ -1,6 +1,6 @@
 # Copyright Contributors to the Open Cluster Management project
 
-FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/stolostron/multicluster-observability-operator
 
-go 1.20
+go 1.21
 
 require (
 	github.com/IBM/controller-filtered-cache v0.3.6

diff --git a/go.sum b/go.sum
diff --git a/loaders/dashboards/Containerfile.operator b/loaders/dashboards/Containerfile.operator
@@ -1,7 +1,7 @@
 # Copyright Contributors to the Open Cluster Management project
 # Licensed under the Apache License 2.0
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./loaders/dashboards ./

diff --git a/loaders/dashboards/Dockerfile b/loaders/dashboards/Dockerfile
@@ -1,6 +1,6 @@
 # Copyright Contributors to the Open Cluster Management project
 
-FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./loaders/dashboards ./

diff --git a/operators/endpointmetrics/Containerfile.operator b/operators/endpointmetrics/Containerfile.operator
@@ -1,6 +1,6 @@
 # Copyright (c) 2021 Red Hat, Inc.
 # Copyright Contributors to the Open Cluster Management project.
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./

diff --git a/operators/endpointmetrics/Dockerfile b/operators/endpointmetrics/Dockerfile
@@ -1,6 +1,6 @@
 # Copyright (c) 2021 Red Hat, Inc.
 # Copyright Contributors to the Open Cluster Management project.
-FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./

diff --git a/operators/multiclusterobservability/Containerfile.operator b/operators/multiclusterobservability/Containerfile.operator
@@ -1,7 +1,7 @@
 # Copyright Contributors to the Open Cluster Management project
 # Licensed under the Apache License 2.0
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./

diff --git a/operators/multiclusterobservability/Dockerfile b/operators/multiclusterobservability/Dockerfile
@@ -1,6 +1,6 @@
 # Copyright Contributors to the Open Cluster Management project
 
-FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux AS builder
 
 
 WORKDIR /workspace

diff --git a/proxy/Containerfile.operator b/proxy/Containerfile.operator
@@ -1,6 +1,6 @@
 # Copyright Contributors to the Open Cluster Management project
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./

diff --git a/proxy/Dockerfile b/proxy/Dockerfile
@@ -1,6 +1,6 @@
 # Copyright Contributors to the Open Cluster Management project
 
-FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./

diff --git a/tests/Containerfile.operator b/tests/Containerfile.operator
@@ -1,7 +1,7 @@
 # Copyright Contributors to the Open Cluster Management project
 # Licensed under the Apache License 2.0
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS builder
 
 WORKDIR /workspace
 # copy go tests into build image

diff --git a/tests/Dockerfile b/tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux AS builder
 
 WORKDIR /workspace
 # copy go tests into build image

diff --git a/tools/simulator/alert-forward/Containerfile.operator b/tools/simulator/alert-forward/Containerfile.operator
@@ -1,7 +1,7 @@
 # Copyright Contributors to the Open Cluster Management project
 # Licensed under the Apache License 2.0
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./
@@ -22,4 +22,3 @@ COPY tools/simulator/alert-forward/alerts.json /tmp/
 USER ${USER_UID}
 
 ENTRYPOINT ["/usr/local/bin/alert-forwarder"]
-
diff --git a/tools/simulator/alert-forward/Dockerfile b/tools/simulator/alert-forward/Dockerfile
@@ -1,6 +1,6 @@
 # Copyright Contributors to the Open Cluster Management project
 
-FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux AS builder
 
 WORKDIR /workspace
 COPY go.sum go.mod ./
@@ -21,4 +21,3 @@ COPY tools/simulator/alert-forward/alerts.json /tmp/
 USER ${USER_UID}
 
 ENTRYPOINT ["/usr/local/bin/alert-forwarder"]
-
diff --git a/tools/simulator/metrics-collector/metrics-extractor/Containerfile.operator b/tools/simulator/metrics-collector/metrics-extractor/Containerfile.operator
@@ -1,7 +1,7 @@
 # Copyright Contributors to the Open Cluster Management project
 # Licensed under the Apache License 2.0
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS builder
 
 RUN GOBIN=/usr/local/bin go install github.com/brancz/gojsontoyaml@latest
 

diff --git a/tools/simulator/metrics-collector/metrics-extractor/Dockerfile b/tools/simulator/metrics-collector/metrics-extractor/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux AS builder
 
 RUN GOBIN=/usr/local/bin go install github.com/brancz/gojsontoyaml@latest