Merge pull request #113 from openshift-bot/art-consistency-openshift-4.17-kube-state-metrics

openshift-merge-bot[bot] · web-flow · commit 8b24e32af32d · 2024-05-30T18:08:29.000Z
OCPBUGS-34202: Updating kube-state-metrics-container image to be consistent with ART for 4.17
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.21-openshift-4.17
+  tag: rhel-9-release-golang-1.22-openshift-4.17
diff --git a/Dockerfile.ocp b/Dockerfile.ocp
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
 WORKDIR /go/src/k8s.io/kube-state-metrics
 COPY . .
 ENV GOFLAGS="-mod=vendor"
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/kube-state-metrics/v2
 
-go 1.21
+go 1.22
 
 require (
 	github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS builder`
	`1`	`+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder`
`2`	`2`	`WORKDIR /go/src/k8s.io/kube-state-metrics`
`3`	`3`	`COPY . .`
`4`	`4`	`ENV GOFLAGS="-mod=vendor"`