Skip to content

Commit 5f4a58a

Browse files
Merge pull request #1450 from openshift-bot/art-consistency-openshift-4.22-ose-machine-api-operator
OCPBUGS-69862: Updating ose-machine-api-operator-container image to be consistent with ART for 4.22
2 parents 83936dd + 7b17f09 commit 5f4a58a

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.24-openshift-4.21
4+
tag: rhel-9-release-golang-1.24-openshift-4.22

Dockerfile.rhel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder
22
WORKDIR /go/src/github.com/openshift/machine-api-operator
33
COPY . .
44
RUN NO_DOCKER=1 make build && \
55
mkdir -p /tmp/build && \
66
cp /go/src/github.com/openshift/machine-api-operator/bin/machine-api-tests-ext /tmp/build/machine-api-tests-ext && \
77
gzip /tmp/build/machine-api-tests-ext
88

9-
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
9+
FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
1010
COPY --from=builder /go/src/github.com/openshift/machine-api-operator/install manifests
1111
COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machine-api-operator .
1212
COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/nodelink-controller .

0 commit comments

Comments
 (0)