Merge pull request openshift#144 from shiftstack/bump-image

openshift-merge-bot[bot] · web-flow · commit 6a72c2541e6b · 2024-07-10T14:29:11.000Z
OCPBUGS-34363: Updating csi-driver-nfs-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/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/kubernetes-csi/csi-driver-nfs
 
-go 1.21
+go 1.22
 
 require (
 	github.com/container-storage-interface/spec v1.8.0
diff --git a/images/Dockerfile b/images/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
 COPY . /go/src/github.com/openshift/csi-driver-nfs
 RUN cd /go/src/github.com/openshift/csi-driver-nfs && \
     go build -o /go/src/github.com/openshift/csi-driver-nfs/nfsplugin cmd/nfsplugin/main.go
diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/testfiles/testdata/a/foo.txt b/vendor/k8s.io/kubernetes/test/e2e/framework/testfiles/testdata/a/foo.txt

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`
	`1`	`+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17`
`2`	`2`	`COPY . /go/src/github.com/openshift/csi-driver-nfs`
`3`	`3`	`RUN cd /go/src/github.com/openshift/csi-driver-nfs && \`
`4`	`4`	`go build -o /go/src/github.com/openshift/csi-driver-nfs/nfsplugin cmd/nfsplugin/main.go`