From 4614767719b7ece0a20ce9da1381cdd357814e53 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 20 Dec 2025 05:35:12 +0000 Subject: [PATCH] Updating ose-cloud-credential-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-cloud-credential-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index e307e5af66..284a910090 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.24-openshift-4.21 + tag: rhel-9-release-golang-1.24-openshift-4.22 diff --git a/Dockerfile b/Dockerfile index 3d4c38f82e..defc5cb262 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder_rhel9 +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder_rhel9 WORKDIR /go/src/github.com/openshift/cloud-credential-operator COPY . . ENV GO_PACKAGE github.com/openshift/cloud-credential-operator @@ -8,14 +8,14 @@ RUN make cloud-credential-tests-ext && \ mkdir -p /tmp/build && \ gzip -c ./cloud-credential-tests-ext > /tmp/build/cloud-credential-tests-ext.gz -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.21 AS builder_rhel8 +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.22 AS builder_rhel8 WORKDIR /go/src/github.com/openshift/cloud-credential-operator COPY . . ENV GO_PACKAGE github.com/openshift/cloud-credential-operator RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" ./cmd/ccoctl -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 COPY --from=builder_rhel9 /go/src/github.com/openshift/cloud-credential-operator/cloud-credential-operator /usr/bin/cloud-credential-operator COPY --from=builder_rhel8 /go/src/github.com/openshift/cloud-credential-operator/ccoctl /usr/bin/ccoctl.rhel8 COPY --from=builder_rhel9 /go/src/github.com/openshift/cloud-credential-operator/ccoctl /usr/bin/ccoctl.rhel9