From d9009f3f9a4bcf8f7c8056d2bac99386f9510ccd Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 3 Aug 2023 01:22:53 +0000 Subject: [PATCH] Updating ose-cluster-authentication-operator images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/a49db9a37378a17d10c41bd37449aaf17178cd77/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 00d7adfcf4..8cbfaddc8e 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.17-openshift-4.10 + tag: rhel-8-release-golang-1.18-openshift-4.11 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index 2c9c3f3af7..2688444446 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,10 +1,10 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 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.10:base +FROM registry.ci.openshift.org/ocp/4.11:base 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/0000_50_cluster-authentication-operator_01_config.crd.yaml /manifests/01_config.crd.yaml