bump to go 1.18

openshift · Jun 6, 2022 · aee2330 · aee2330
1 parent b372480
commit aee2330
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 265 deletions.
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.17-openshift-4.11
+  tag: rhel-8-release-golang-1.18-openshift-4.11
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/openshift/release:golang-1.17 AS builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.18 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-autoscaler-operator
 COPY . .
 ENV NO_DOCKER=1

diff --git a/Dockerfile.rhel b/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-autoscaler-operator
 COPY . .
 ENV NO_DOCKER=1

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ LD_FLAGS    ?= -X $(REPO_PATH)/pkg/version.Raw=$(VERSION)
 BUILD_DEST  ?= bin/cluster-autoscaler-operator
 MUTABLE_TAG ?= latest
 IMAGE        = origin-cluster-autoscaler-operator
-BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.17
+BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.18
 
 GOFLAGS ?= -mod=vendor
 export GOFLAGS

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/cluster-autoscaler-operator
 
-go 1.17
+go 1.18
 
 require (
 	github.com/blang/semver v3.5.1+incompatible