From 21fae9f8859fbc5d87582420bdfed1401a2185f1 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 15 May 2023 09:48:43 +0000 Subject: [PATCH] Updating ingress-node-firewall-operator images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b19b910c2c26178e10f256213883e7ea6a4c890a/images/ingress-node-firewall-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile.openshift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 9a3f7b8fb..810de9f0e 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.19-openshift-4.14 + tag: rhel-9-release-golang-1.20-openshift-4.14 diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 516932aed..4c6c7f31d 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,5 +1,5 @@ # Build the manager binary -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 AS builder WORKDIR /workspace @@ -18,7 +18,7 @@ COPY bindata/manifests/ bindata/manifests/ # Build RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -mod=vendor -o manager main.go -FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.14 +FROM registry.ci.openshift.org/ocp/4.14:base-rhel9 WORKDIR / COPY --from=builder /workspace/manager . COPY --from=builder /workspace/bindata/manifests /bindata/manifests