From 4264b0c64cb3e39683ecf3662febb7ee218c7a93 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Wed, 10 Nov 2021 15:43:17 +0000 Subject: [PATCH] Updating ose-machine-api-operator images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/5b89f5b601508a0bcc0399fd3f34b7aa2e86e90e/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 5b5cd20fdc..00d7adfcf4 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: golang-1.16 + tag: rhel-8-release-golang-1.17-openshift-4.10 diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 5a51dfbe2c..380769397a 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 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.9:base +FROM registry.ci.openshift.org/ocp/4.10: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 .