Merge pull request kubernetes-csi#130 from openshift-bot/art-consistency-openshift-4.16-ose-csi-snapshot-controller

openshift-merge-bot[bot] · web-flow · commit c303fc4922df · 2023-12-11T17:53:36.000Z
OCPBUGS-25124: Updating ose-csi-snapshot-controller-container image to be consistent with ART
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.16
+  tag: rhel-9-release-golang-1.20-openshift-4.16
diff --git a/Dockerfile.snapshot-controller.openshift.rhel7 b/Dockerfile.snapshot-controller.openshift.rhel7
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter
 COPY . .
 RUN make build

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.16 AS builder`
	`1`	`+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 AS builder`
`2`	`2`	`WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter`
`3`	`3`	`COPY . .`
`4`	`4`	`RUN make build`