Merge pull request #10 from mpatlasov/OCPBUGS-34454-bump-golang-to-1.22-for-ART

openshift-merge-bot[bot] · web-flow · commit c566fc289733 · 2024-07-09T21:15:14.000Z
OCPBUGS-34454: Updating ose-smb-csi-driver-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.openshift b/Dockerfile.openshift
@@ -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/github.com/openshift/csi-driver-smb
 COPY . .
 RUN make smb ARCH=$(go env GOARCH) && cp _output/$(go env GOARCH)/smbplugin .
diff --git a/go.mod b/go.mod
@@ -1,8 +1,8 @@
 module github.com/kubernetes-csi/csi-driver-smb
 
-go 1.21
+go 1.22
 
-toolchain go1.21.7
+toolchain go1.22.1
 
 require (
 	github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
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 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/github.com/openshift/csi-driver-smb`
`3`	`3`	`COPY . .`
`4`	`4`	`RUN make smb ARCH=$(go env GOARCH) && cp _output/$(go env GOARCH)/smbplugin .`