From e1b6c3546e2d59f9ddba7d5dfeca6bced03387ce Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sun, 10 Dec 2023 22:58:27 +0000 Subject: [PATCH] Updating ose-machine-api-operator-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/c78b2b27f47b41d5d59449c863f3dea6eaa988b7/images/ose-machine-api-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile.rhel | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 7096df34e3..a83f0f8430 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.20-openshift-4.15 + tag: rhel-9-release-golang-1.21-openshift-4.16 diff --git a/Dockerfile.rhel b/Dockerfile.rhel index ce6ba801d9..49a5169076 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder WORKDIR /go/src/github.com/openshift/machine-api-operator COPY . . RUN NO_DOCKER=1 make build -FROM registry.ci.openshift.org/ocp/4.15:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 COPY --from=builder /go/src/github.com/openshift/machine-api-operator/install manifests COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machine-api-operator . COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/nodelink-controller .