Update to Go 1.20 (#3429)

* Go 1.20 changes * go 1.20 does not need the seed randomised by default * go generate
Azure · Mar 5, 2024 · ed94c28 · ed94c28
1 parent 172741b
commit ed94c28
Show file tree

Hide file tree

Showing 25 changed files with 34 additions and 46 deletions.
diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml
@@ -15,7 +15,7 @@ jobs:
   ci-from-docker:
     runs-on: ubuntu-latest
     container:
-      image: registry.access.redhat.com/ubi8/go-toolset:1.18.10
+      image: registry.access.redhat.com/ubi8/go-toolset:1.20.10
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -38,13 +38,13 @@ jobs:
       uses: actions/checkout@v4
     - run: |
         go mod vendor
-        go mod tidy -compat=1.18
+        go mod tidy -compat=1.20
         hack/ci-utils/isClean.sh
 
   generate-check:
     runs-on: ubuntu-latest
     container:
-      image: registry.access.redhat.com/ubi8/go-toolset:1.18.10
+      image: registry.access.redhat.com/ubi8/go-toolset:1.20.10
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4

diff --git a/.golangci.yml b/.golangci.yml
@@ -10,7 +10,7 @@ run:
     - "containers_image_openpgp"
     - "exclude_graphdriver_devicemapper"
     - "exclude_graphdriver_btrfs"
-  go: "1.18"
+  go: "1.20"
 
 output:
   format: github-actions

diff --git a/.pipelines/ci.yml b/.pipelines/ci.yml
@@ -22,7 +22,7 @@ pr:
 resources:
   containers:
     - container: golang
-      image: registry.access.redhat.com/ubi8/go-toolset:1.18.10
+      image: registry.access.redhat.com/ubi8/go-toolset:1.20.10
       options: --user=0
     - container: python
       image: registry.access.redhat.com/ubi8/python-39:latest

diff --git a/.pipelines/clean-subscription.yml b/.pipelines/clean-subscription.yml
@@ -9,7 +9,7 @@ parameters:
 resources:
   containers:
     - container: golang
-      image: registry.access.redhat.com/ubi8/go-toolset:1.18
+      image: registry.access.redhat.com/ubi8/go-toolset:1.20
       options: --user=0
 
 variables:

diff --git a/.pipelines/onebranch/pipeline.buildrp.official.yml b/.pipelines/onebranch/pipeline.buildrp.official.yml
@@ -14,7 +14,7 @@ pr: none
 variables:
   Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io
-  LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.18.4 # Docker image which is used to build the project https://aka.ms/obpipelines/containers
+  LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.20.10 # Docker image which is used to build the project https://aka.ms/obpipelines/containers
   Debian_Frontend: noninteractive
 
 resources:

diff --git a/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml b/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml
@@ -14,7 +14,7 @@ pr: none
 variables:
   Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io
-  LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.18.4 # Docker image which is used to build the project https://aka.ms/obpipelines/containers
+  LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.20.10 # Docker image which is used to build the project https://aka.ms/obpipelines/containers
   Debian_Frontend: noninteractive
 
 resources:

diff --git a/Dockerfile.aro-e2e b/Dockerfile.aro-e2e
@@ -1,7 +1,7 @@
 # Uses a multi-stage container build to build the RP & E2E components.
 #
 ARG REGISTRY
-FROM ${REGISTRY}/ubi8/go-toolset:1.18.10 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.20.10 AS builder
 
 USER root
 ENV GOPATH=/root/go

diff --git a/Dockerfile.aro-multistage b/Dockerfile.aro-multistage
@@ -1,7 +1,7 @@
 # Uses a multi-stage container build to build the RP.
 #
 ARG REGISTRY
-FROM ${REGISTRY}/ubi8/go-toolset:1.18.10 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.20.10 AS builder
 
 USER root
 ENV GOPATH=/root/go

diff --git a/Dockerfile.gatekeeper b/Dockerfile.gatekeeper
@@ -1,5 +1,5 @@
 ARG REGISTRY
-FROM ${REGISTRY}/ubi8/go-toolset:1.18.10-1 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.20.10-1 AS builder
 ARG GATEKEEPER_VERSION
 ENV DOWNLOAD_URL=https://github.com/open-policy-agent/gatekeeper/archive/${GATEKEEPER_VERSION}.tar.gz
 
@@ -29,4 +29,4 @@ ENTRYPOINT ["/manager"]
 
 USER ${USER_UID}
 LABEL io.openshift.managed.name="guardrails-operator" \
-      io.openshift.managed.description="Operator to enforce guardrails policies for Openshift version 4 clusters"
+    io.openshift.managed.description="Operator to enforce guardrails policies for Openshift version 4 clusters"
diff --git a/Dockerfile.proxy b/Dockerfile.proxy
@@ -1,7 +1,7 @@
 # Uses a multi-stage container build to build the proxy
 #
 ARG REGISTRY
-FROM ${REGISTRY}/ubi8/go-toolset:1.18.10 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.20.10 AS builder
 USER root
 ENV GOPATH=/root/go
 RUN mkdir -p /app

diff --git a/cmd/aro/main.go b/cmd/aro/main.go
@@ -7,12 +7,10 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"math/rand"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/Azure/ARO-RP/pkg/env"
 	utillog "github.com/Azure/ARO-RP/pkg/util/log"
@@ -35,8 +33,6 @@ func usage() {
 }
 
 func main() {
-	rand.Seed(time.Now().UnixNano())
-
 	flag.Usage = usage
 	flag.Parse()
 

diff --git a/docs/prepare-a-shared-rp-development-environment.md b/docs/prepare-a-shared-rp-development-environment.md
@@ -45,7 +45,7 @@ locations.
    PULL_SECRET=...
    ```
 
-1. Install [Go 1.18](https://golang.org/dl) or later, if you haven't already.
+1. Install [Go 1.20](https://golang.org/dl) or later, if you haven't already.
 
 1. Install the [Azure
    CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli), if you

diff --git a/docs/prepare-your-dev-environment.md b/docs/prepare-your-dev-environment.md
@@ -4,7 +4,7 @@ This document goes through the development dependencies one requires in order to
 
 ## Software Required
 
-1. Install [Go 1.18](https://golang.org/dl) or later, if you haven't already.
+1. Install [Go 1.20](https://golang.org/dl) or later, if you haven't already.
    1. After downloading follow the [Install instructions](https://go.dev/doc/install), replacing the tar archive with your download.
    1. Append `export PATH="${PATH}:/usr/local/go/bin"` to your shell's profile file.
 

diff --git a/docs/updating-dependencies.md b/docs/updating-dependencies.md
@@ -21,7 +21,7 @@ The reason for calling script instead of directly calling:
 
 ```bash
 go get -u ./...
-go mod tidy -compat=1.18
+go mod tidy -compat=1.20
 go mod vendor
 ```
 
@@ -43,7 +43,7 @@ the PR, one can simply call
 go get <module>@<release> OR
 go get -u <module>@<release>
 
-go mod tidy -compat=1.18
+go mod tidy -compat=1.20
 go mod vendor
 ```
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/ARO-RP
 
-go 1.18
+go 1.20
 
 require (
 	github.com/Azure/azure-sdk-for-go v63.1.0+incompatible

diff --git a/hack/cluster/cluster.go b/hack/cluster/cluster.go
@@ -6,10 +6,8 @@ package main
 import (
 	"context"
 	"fmt"
-	"math/rand"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/davecgh/go-spew/spew"
 	"github.com/sirupsen/logrus"
@@ -71,8 +69,6 @@ func run(ctx context.Context, log *logrus.Entry) error {
 func main() {
 	log := utillog.GetLogger()
 
-	rand.Seed(time.Now().UnixNano())
-
 	if err := run(context.Background(), log); err != nil {
 		if oDataError, ok := err.(msgraph_errors.ODataErrorable); ok {
 			spew.Dump(oDataError.GetErrorEscaped())

diff --git a/hack/update-go-module-dependencies.sh b/hack/update-go-module-dependencies.sh
@@ -62,5 +62,5 @@ done
 
 go get -u ./...
 
-go mod tidy -compat=1.18
+go mod tidy -compat=1.20
 go mod vendor
diff --git a/pkg/api/admin/zz_generated_installphase_enumer.go b/pkg/api/admin/zz_generated_installphase_enumer.go
diff --git a/pkg/api/zz_generated_installphase_enumer.go b/pkg/api/zz_generated_installphase_enumer.go
diff --git a/pkg/containerinstall/install_test.go b/pkg/containerinstall/install_test.go
@@ -27,7 +27,7 @@ import (
 	testlog "github.com/Azure/ARO-RP/test/util/log"
 )
 
-const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.18.10"
+const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.20.10"
 
 var _ = Describe("Podman", Ordered, func() {
 	var err error

diff --git a/pkg/env/zz_generated_feature_enumer.go b/pkg/env/zz_generated_feature_enumer.go
diff --git a/pkg/operator/controllers/rbac/bindata.go b/pkg/operator/controllers/rbac/bindata.go
diff --git a/pkg/portal/cluster/bindata.go b/pkg/portal/cluster/bindata.go
diff --git a/pkg/util/cluster/cluster.go b/pkg/util/cluster/cluster.go
@@ -346,7 +346,6 @@ func (c *Cluster) generateSubnets() (vnetPrefix string, masterSubnet string, wor
 	// 10.1.0.0/24 is used by rp-vnet to host Proxy VM
 	// 10.2.0.0/24 is used by dev-vpn-vnet to host VirtualNetworkGateway
 	var x, y int
-	rand.Seed(time.Now().UnixNano())
 	// Local Dev clusters are limited to /16 dev-vnet
 	if !c.ci {
 		x, y = 0, 2*rand.Intn(128)

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -8,9 +8,7 @@ package e2e
 
 import (
 	"flag"
-	"math/rand"
 	"testing"
-	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -23,8 +21,6 @@ import (
 )
 
 func TestE2E(t *testing.T) {
-	rand.Seed(time.Now().UnixNano())
-
 	flag.Parse()
 	logrus.SetOutput(GinkgoWriter)
 	log = utillog.GetLogger()