From 7be6318e74750da3c7e8af332cdc60832963c7e2 Mon Sep 17 00:00:00 2001 From: Ilias Rinis Date: Fri, 26 Jun 2026 10:30:21 +0200 Subject: [PATCH] Updating ose-cluster-authentication-operator-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-cluster-authentication-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile.rhel7 | 4 ++-- go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a3628cf24..1d88a59fd 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.25-openshift-4.22 + tag: rhel-9-release-golang-1.26-openshift-5.0 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index 8a448f80a..90f9de2ad 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder # This pattern is documented in https://github.com/openshift/enhancements/pull/1672. Use ARG to build images based on platform. ARG TAGS=ocp WORKDIR /go/src/github.com/openshift/cluster-authentication-operator @@ -8,7 +8,7 @@ RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe RUN GO_BUILD_PACKAGES=./cmd/cluster-authentication-operator-tests-ext make build --warn-undefined-variables \ && gzip cluster-authentication-operator-tests-ext -FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 +FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 COPY --from=builder /go/src/github.com/openshift/cluster-authentication-operator/authentication-operator /usr/bin/ COPY --from=builder /go/src/github.com/openshift/cluster-authentication-operator/cluster-authentication-operator-tests-ext.gz /usr/bin/ COPY manifests /manifests diff --git a/go.mod b/go.mod index ba92f54aa..4ce82fadf 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/cluster-authentication-operator -go 1.25.0 +go 1.26.0 require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc