From 4b5ecb1f4afd4b8384ab23fc2d24180d0be6d5e9 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 28 Nov 2023 21:37:34 +0000 Subject: [PATCH] Updating ose-cluster-kube-controller-manager-operator-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/9dc2a375bf335e7e4e3d7e75abc5c3bdbb0c0e98/images/ose-cluster-kube-controller-manager-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 7cd14bfef..7096df34e 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.20-openshift-4.15 + tag: rhel-9-release-golang-1.20-openshift-4.15 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index e47e5474b..f6b41ffd2 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder WORKDIR /go/src/github.com/openshift/cluster-kube-controller-manager-operator COPY . . RUN make build --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/4.15:base +FROM registry.ci.openshift.org/ocp/4.15:base-rhel9 RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests/ /usr/share/bootkube/manifests/config/ /usr/share/bootkube/manifests/manifests/ COPY --from=builder /go/src/github.com/openshift/cluster-kube-controller-manager-operator/bindata/bootkube/bootstrap-manifests /usr/share/bootkube/manifests/bootstrap-manifests/ COPY --from=builder /go/src/github.com/openshift/cluster-kube-controller-manager-operator/bindata/bootkube/config /usr/share/bootkube/manifests/config/