*: use go 1.22.9

Signed-off-by: Steve Kuznetsov <[email protected]>
Azure · Jan 29, 2025 · 15bcdab · 15bcdab
1 parent 09155d0
commit 15bcdab
Show file tree

Hide file tree

Showing 30 changed files with 31 additions and 31 deletions.
diff --git a/.bingo/bingo.mod b/.bingo/bingo.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require github.com/bwplotka/bingo v0.9.0
diff --git a/.bingo/client-gen.mod b/.bingo/client-gen.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require k8s.io/code-generator v0.25.16 // cmd/client-gen
diff --git a/.bingo/controller-gen.mod b/.bingo/controller-gen.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require sigs.k8s.io/controller-tools v0.9.0 // cmd/controller-gen
diff --git a/.bingo/controller-gen.sum b/.bingo/controller-gen.sum
@@ -332,7 +332,7 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
-github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
+github.com/moby/term v0.0.0-2021061.22.90-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

diff --git a/.bingo/enumer.mod b/.bingo/enumer.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require github.com/dmarkham/enumer v1.5.10
diff --git a/.bingo/fips-detect.mod b/.bingo/fips-detect.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require github.com/acardace/fips-detect v0.0.0-20230309083406-7157dae5bafd
diff --git a/.bingo/gencosmosdb.mod b/.bingo/gencosmosdb.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require github.com/jewzaam/go-cosmosdb v0.0.0-20240729051124-c9cf2c4f6aa1 // cmd/gencosmosdb
diff --git a/.bingo/go-bindata.mod b/.bingo/go-bindata.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require github.com/go-bindata/go-bindata v3.1.2+incompatible // go-bindata
diff --git a/.bingo/gocov-xml.mod b/.bingo/gocov-xml.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require github.com/AlekSi/gocov-xml v1.1.0
diff --git a/.bingo/gocov.mod b/.bingo/gocov.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require github.com/axw/gocov v1.1.0 // gocov
diff --git a/.bingo/goimports.mod b/.bingo/goimports.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require golang.org/x/tools v0.23.0 // cmd/goimports
diff --git a/.bingo/gojq.mod b/.bingo/gojq.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require github.com/itchyny/gojq v0.12.16 // cmd/gojq
diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require github.com/golangci/golangci-lint v1.59.1 // cmd/golangci-lint
diff --git a/.bingo/gotestsum.mod b/.bingo/gotestsum.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21
+go 1.22.9
 
 require gotest.tools/gotestsum v1.11.0
diff --git a/.bingo/mockgen.mod b/.bingo/mockgen.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21.13
+go 1.22.9
 
 require go.uber.org/mock v0.4.0 // mockgen
diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml
@@ -15,7 +15,7 @@ jobs:
   vendor-check:
     runs-on: ubuntu-latest
     container:
-      image: registry.access.redhat.com/ubi8/go-toolset:1.21.13-1
+      image: registry.access.redhat.com/ubi8/go-toolset:1.22.9-2
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -29,7 +29,7 @@ jobs:
   generate-check:
     runs-on: ubuntu-latest
     container:
-      image: registry.access.redhat.com/ubi8/go-toolset:1.21.13-1
+      image: registry.access.redhat.com/ubi8/go-toolset:1.22.9-2
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4

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.21.13-1
+      image: registry.access.redhat.com/ubi8/go-toolset:1.22.9-2
       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.21.13-1 # 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.22.9-2 # 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.21.13-1 # 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.22.9-2 # 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.21.13-1 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.22.9-2 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.21.13-1 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.22.9-2 AS builder
 
 USER root
 ENV GOPATH=/root/go

diff --git a/Dockerfile.ci-rp b/Dockerfile.ci-rp
@@ -23,7 +23,7 @@ RUN npm run lint && npm run build
 ###############################################################################
 # Stage 2: Compile the Golang RP code
 ###############################################################################
-FROM ${REGISTRY}/ubi8/go-toolset:1.21.13-1 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.22.9-2 AS builder
 ARG ARO_VERSION
 LABEL aro-builder=true
 USER root

diff --git a/Dockerfile.ci-tunnel b/Dockerfile.ci-tunnel
@@ -1,7 +1,7 @@
 ARG REGISTRY
 ARG ARO_VERSION
 
-FROM ${REGISTRY}/ubi8/go-toolset:1.21.13-1 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.22.9-2 AS builder
 ARG ARO_VERSION
 USER root
 WORKDIR /app

diff --git a/Dockerfile.gatekeeper b/Dockerfile.gatekeeper
@@ -1,5 +1,5 @@
 ARG REGISTRY
-FROM ${REGISTRY}/ubi8/go-toolset:1.21.13-1 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.22.9-2 AS builder
 ARG GATEKEEPER_VERSION
 ENV DOWNLOAD_URL=https://github.com/open-policy-agent/gatekeeper/archive/${GATEKEEPER_VERSION}.tar.gz
 

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.21.13-1 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.22.9-2 AS builder
 USER root
 ENV GOPATH=/root/go
 RUN mkdir -p /app

diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ AUTOREST_IMAGE = quay.io/openshift-on-azure/autorest:${AUTOREST_VERSION}
 GATEKEEPER_VERSION = v3.15.1
 
 # Golang version go mod tidy compatibility
-GOLANG_VERSION ?= 1.21
+GOLANG_VERSION ?= 1.22.9
 
 include .bingo/Variables.mk
 

diff --git a/docs/prepare-a-shared-rp-development-environment.md b/docs/prepare-a-shared-rp-development-environment.md
@@ -65,7 +65,7 @@ Data Reader` or `Storage Blob Data Contributor` role on the storage account.
    PULL_SECRET=...
    ```
 
-1. Install [Go 1.21](https://golang.org/dl) or later, if you haven't already.
+1. Install [Go 1.22](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
@@ -21,7 +21,7 @@ That's it! You can jump to [Getting Started](#getting-started) below to grab the
 
 If you'd like to run an RP instance as a golang process (via `go run`) locally - you'll need additional tools:
 
-1. Install [Go 1.21](https://golang.org/dl) or later, if you haven't already.
+1. Install [Go 1.22](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/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/ARO-RP
 
-go 1.21
+go 1.22.9
 
 require (
 	github.com/Azure/azure-sdk-for-go v63.1.0+incompatible

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.21.13-1"
+const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.22.9-2"
 
 var _ = Describe("Podman", Ordered, func() {
 	var err error