Merge pull request #89 from openshift-bot/art-consistency-openshift-4.16-ose-olm-operator-controller

OCPBUGS-31285: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.21-openshift-4.16
+  tag: rhel-9-release-golang-1.21-openshift-4.16

go.mod

@@ -2,7 +2,7 @@ module github.com/operator-framework/operator-controller
 
 go 1.21
 
-toolchain go1.21.0
+toolchain go1.21.7
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1

openshift/operator-controller.Dockerfile

@@ -1,9 +1,9 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
 WORKDIR /build
 COPY . .
 RUN make go-build-local
 
-FROM registry.ci.openshift.org/ocp/4.16:base
+FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
 USER 1001
 COPY --from=builder /build/bin/manager /manager
 COPY openshift/manifests /openshift/manifests