From b915f47f2386d4b325f76eb7d9888080d8cda49c Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Fri, 6 Sep 2024 15:03:59 +0000 Subject: [PATCH] Updating ose-cluster-authentication-operator-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/a766adea3c1c954d36052153083a7d2840929113/images/ose-cluster-authentication-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile.rhel7 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a83f0f843..1e59c02c2 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.rhel7 b/Dockerfile.rhel7 index b1874a0b7..0ef37c4bd 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,10 +1,10 @@ -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/openshift/cluster-authentication-operator COPY . . ENV GO_PACKAGE github.com/openshift/cluster-authentication-operator RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" -tags="ocp" -o authentication-operator ./cmd/authentication-operator -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/openshift/cluster-authentication-operator/authentication-operator /usr/bin/ COPY manifests /manifests COPY vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_50_authentication_01_authentications.crd.yaml /manifests/01_config.crd.yaml