From a5064c327c3fea8a00191f66960b7412e520fd6b Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sun, 2 Oct 2022 05:37:31 +0000 Subject: [PATCH] Updating ose-machine-api-operator images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/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 8cbfaddc8e..b14fb3fdf0 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.18-openshift-4.11 + tag: rhel-8-release-golang-1.19-openshift-4.12 diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 7561f0fcb7..220f6ec5b8 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 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.11:base +FROM registry.ci.openshift.org/ocp/4.12:base 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 .