Merge pull request #485 from openshift-bot/art-consistency-openshift-…

…4.15-ose-aws-cluster-api-controllers OCPBUGS-24113: Updating ose-aws-cluster-api-controllers-container image to be consistent with ART
openshift · Dec 7, 2023 · 3e23a96 · 3e23a96
2 parents e934733 + 7978be8
commit 3e23a96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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.20-openshift-4.15
+  tag: rhel-9-release-golang-1.20-openshift-4.15
diff --git a/openshift/Dockerfile.openshift b/openshift/Dockerfile.openshift
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
 
 WORKDIR /build
 COPY . .
@@ -7,7 +7,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \
   -o=cluster-api-provider-aws-controller-manager \
   main.go
 
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
 
 LABEL description="Cluster API Provider AWS Controller Manager"