From f5807e3d18b402e8bbcc0c5555b341b13868795c Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 25 May 2024 14:55:13 +0000 Subject: [PATCH] UPSTREAM: : Updating csi-provisioner-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/csi-provisioner.yml --- .ci-operator.yaml | 2 +- Dockerfile.openshift.rhel7 | 4 ++-- go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a83f0f8430..1e59c02c25 100644 --- 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.22-openshift-4.17 diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7 index e4707526e2..070083fff5 100644 --- a/Dockerfile.openshift.rhel7 +++ b/Dockerfile.openshift.rhel7 @@ -1,8 +1,8 @@ -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.22-openshift-4.17 AS builder WORKDIR /go/src/github.com/kubernetes-csi/external-provisioner COPY . . RUN make build -FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 COPY --from=builder /go/src/github.com/kubernetes-csi/external-provisioner/bin/csi-provisioner /usr/bin/ ENTRYPOINT ["/usr/bin/csi-provisioner"] diff --git a/go.mod b/go.mod index fff06492a4..926c684cd4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kubernetes-csi/external-provisioner -go 1.21 +go 1.22 require ( github.com/container-storage-interface/spec v1.9.0