From 94ae2be7d1d7a7b404c1cb8c56842d217b3a5dd6 Mon Sep 17 00:00:00 2001
From: AOS Automation Release Team <noreply@redhat.com>
Date: Mon, 8 Apr 2024 09:45:05 -0400
Subject: [PATCH] UPSTREAM: <carry>: Updating ose-olm-catalogd-container image
 to be consistent with ART for 4.16 Reconciling with
 https://github.com/openshift/ocp-build-data/tree/cd35345d4d061d63bddd2911a9c77149106dee55/images/ose-olm-catalogd.yml

---
 .ci-operator.yaml    | 2 +-
 go.mod               | 2 +-
 openshift/Dockerfile | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ci-operator.yaml b/.ci-operator.yaml
index 38718883..a83f0f84 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.21-openshift-4.16
+  tag: rhel-9-release-golang-1.21-openshift-4.16
diff --git a/go.mod b/go.mod
index b004abf2..1d09092f 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/operator-framework/catalogd
 
 go 1.21
 
-toolchain go1.21.8
+toolchain go1.21.7
 
 require (
 	github.com/blang/semver/v4 v4.0.0
diff --git a/openshift/Dockerfile b/openshift/Dockerfile
index 66eab974..78ef4c47 100644
--- a/openshift/Dockerfile
+++ b/openshift/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