Merge pull request #2859 from hunterkepley/ocm-13071-3

OCM-13071 | fix: Bump Go version to 1.23

Author: openshift-merge-bot[bot]

.bingo/Variables.mk

@@ -35,11 +35,11 @@ $(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod
 	@echo "(re)installing $(GOBIN)/go-bindata-v3.1.2+incompatible"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.2+incompatible "github.com/go-bindata/go-bindata/go-bindata"
 
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.55.2
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.60.0
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v1.55.2"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.55.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v1.60.0"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.60.0 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
 GORELEASER := $(GOBIN)/goreleaser-v1.25.1
 $(GORELEASER): $(BINGO_DIR)/goreleaser.mod

.bingo/golangci-lint.mod

@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.21.3
+go 1.23.6
 
-require github.com/golangci/golangci-lint v1.55.2 // cmd/golangci-lint
+require github.com/golangci/golangci-lint v1.60.0 // cmd/golangci-lint

.bingo/golangci-lint.sum

@@ -14,7 +14,7 @@ GCI="${GOBIN}/gci-v0.13.4"
 
 GO_BINDATA="${GOBIN}/go-bindata-v3.1.2+incompatible"
 
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.55.2"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.60.0"
 
 GORELEASER="${GOBIN}/goreleaser-v1.25.1"
 

.bingo/variables.env

@@ -14,23 +14,20 @@
 # limitations under the License.
 #
 
+version: "2"
 run:
-  skip-dirs:
-  - assets
-  - docs
-  - templates
-  - vendor
+  go: "1.23"
   issues-exit-code: 1
   modules-download-mode: readonly
 issues:
+  new: true
+  exclude-dirs:
+    - assets
+    - docs
+    - templates
+    - vendor
   max-same-issues: 0
-  exclude-rules:
-    - path: '(.+)_test\.go'
-      linters:
-        - funlen
-        - goconst
-
-linters:
+formatters:
   disable-all: true
   enable:
     - gas
@@ -44,16 +41,19 @@ linters:
     - staticcheck
     - unconvert
     - unused
-linters-settings:
-  staticcheck:
-    go: "1.21"
-  gci:
-    sections:
-      - standard
-      - default
-      - prefix(k8s)
-      - prefix(sigs.k8s)
-      - prefix(github.com)
-      - prefix(gitlab)
-      - prefix(github.com/openshift/rosa)
-    custom-order: true
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(k8s)
+        - prefix(sigs.k8s)
+        - prefix(github.com)
+        - prefix(gitlab)
+        - prefix(github.com/openshift/rosa)
+      custom-order: true
+  exclusions:
+    - path: '(.+)_test\.go'
+      linters:
+        - funlen
+        - goconst

.golangci.yml

@@ -1 +1 @@
-1.53.3
+v1.60.0

.golangciversion

@@ -29,7 +29,7 @@ var _ = Describe("Create machine pool", func() {
 			It("should create machine pool", func() {
 				serviceMock := machinepool.NewMockMachinePoolService(ctrl)
 				serviceMock.EXPECT().CreateMachinePoolBasedOnClusterType(gomock.Any(), gomock.Any(),
-					gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).Times(1)
+					gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).Times(1)
 
 				mockClassicClusterReady := test.MockCluster(func(c *cmv1.ClusterBuilder) {
 					c.AWS(cmv1.NewAWS().SubnetIDs("subnet-0b761d44d3d9a4663", "subnet-0f87f640e56934cbc"))
@@ -38,7 +38,8 @@ var _ = Describe("Create machine pool", func() {
 					c.Hypershift(cmv1.NewHypershift().Enabled(false))
 				})
 				err := serviceMock.CreateMachinePoolBasedOnClusterType(rosa.NewRuntime(), NewCreateMachinePoolCommand(),
-					"82339823", mockClassicClusterReady, NewCreateMachinepoolUserOptions())
+					"82339823", mockClassicClusterReady, mockClassicClusterReady.Autoscaler(),
+					NewCreateMachinepoolUserOptions())
 				Expect(err).ToNot(HaveOccurred())
 
 			})

cmd/create/machinepool/cmd_test.go

@@ -1,8 +1,6 @@
 module github.com/openshift/rosa
 
-go 1.21
-
-toolchain go1.21.3
+go 1.23
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.2.15

go.mod

@@ -1,5 +1,5 @@
 # The image is for Prow CI steps to manage the ROSA cluster lifecycle and testing
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 as builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 as builder
 WORKDIR /go/src/github.com/openshift/rosa
 COPY . .
 RUN go install ./cmd/rosa
@@ -13,7 +13,7 @@ RUN go install github.com/openshift-online/rosa-support@latest
 
 FROM registry.ci.openshift.org/ci/cli-ocm:latest as ocmcli
 
-FROM registry.ci.openshift.org/origin/4.16:cli
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
 COPY --from=builder /go/bin/rosa* /usr/bin
 COPY --from=builder /go/src/github.com/openshift/rosa/tests/ci/data /rosa/tests/ci/data
 COPY --from=builder /go/src/github.com/openshift/rosa/tests/prow_ci.sh /rosa/tests/

images/Dockerfile.e2e

@@ -1,7 +1,7 @@
 # The image is for using the latest released rosa CLI
 FROM registry.ci.openshift.org/ci/cli-ocm:latest as ocmcli
 
-FROM registry.ci.openshift.org/origin/4.16:cli
+FROM registry.ci.openshift.org/origin/scos-4.19:cli
 COPY --from=ocmcli /usr/bin/ocm /usr/bin/ocm
 RUN yum -y install --setopt=skip_missing_names_on_install=False \
     jq \