From d11572e7fe85fd5c236d430c2d047ddf5b3869c3 Mon Sep 17 00:00:00 2001
From: Michael Shen <mshen@redhat.com>
Date: Fri, 29 Mar 2024 14:46:18 -0400
Subject: [PATCH 1/2] Update push steps to use containerized skopeo

Signed-off-by: Michael Shen <mshen@redhat.com>
---
 .../custom-catalog-osd-operator/custom-catalog-build-push.sh  | 2 +-
 .../golang-osd-operator/csv-generate/catalog-publish.sh       | 4 ++--
 .../openshift/golang-osd-operator/csv-generate/common.sh      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/boilerplate/openshift/custom-catalog-osd-operator/custom-catalog-build-push.sh b/boilerplate/openshift/custom-catalog-osd-operator/custom-catalog-build-push.sh
index c677cd08..f67a7c79 100755
--- a/boilerplate/openshift/custom-catalog-osd-operator/custom-catalog-build-push.sh
+++ b/boilerplate/openshift/custom-catalog-osd-operator/custom-catalog-build-push.sh
@@ -7,7 +7,7 @@ CONTAINER_ENGINE=$(command -v podman || command -v docker)
 CONTAINER_ENGINE_SHORT=${CONTAINER_ENGINE##*/}
 REPO_ROOT=$(git rev-parse --show-toplevel)
 VERSIONS_DIR=${REPO_ROOT}/versions
-SKOPEO_IMAGE="quay.io/skopeo/stable:v1.8.0"
+SKOPEO_IMAGE="quay.io/skopeo/stable:v1.14.2"
 
 source $REPO_ROOT/boilerplate/_lib/common.sh
 
diff --git a/boilerplate/openshift/golang-osd-operator/csv-generate/catalog-publish.sh b/boilerplate/openshift/golang-osd-operator/csv-generate/catalog-publish.sh
index 16205295..bdd94227 100755
--- a/boilerplate/openshift/golang-osd-operator/csv-generate/catalog-publish.sh
+++ b/boilerplate/openshift/golang-osd-operator/csv-generate/catalog-publish.sh
@@ -95,7 +95,7 @@ popd
 
 if [ "$push_catalog" = true ] ; then
     # push image
-    skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
+    ${CONTAINER_ENGINE} run ${SKOPEO_IMAGE} -- skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
         "${SRC_CONTAINER_TRANSPORT}:${registry_image}:${operator_channel}-latest" \
         "docker://${registry_image}:${operator_channel}-latest"
 
@@ -104,7 +104,7 @@ if [ "$push_catalog" = true ] ; then
         exit 1
     fi
 
-    skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
+    ${CONTAINER_ENGINE} run ${SKOPEO_IMAGE} -- skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
         "${SRC_CONTAINER_TRANSPORT}:${registry_image}:${operator_channel}-latest" \
         "docker://${registry_image}:${operator_channel}-${operator_commit_hash}"
 
diff --git a/boilerplate/openshift/golang-osd-operator/csv-generate/common.sh b/boilerplate/openshift/golang-osd-operator/csv-generate/common.sh
index 2b44480a..6c863169 100644
--- a/boilerplate/openshift/golang-osd-operator/csv-generate/common.sh
+++ b/boilerplate/openshift/golang-osd-operator/csv-generate/common.sh
@@ -2,6 +2,7 @@
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
 source $REPO_ROOT/boilerplate/_lib/common.sh
+SKOPEO_IMAGE="quay.io/skopeo/stable:v1.14.2"
 
 function check_mandatory_params() {
     local csv_missing_param_error

From 70f4f3e41146868b5ca0d52b917ccfea09fac5f8 Mon Sep 17 00:00:00 2001
From: Michael Shen <mshen@redhat.com>
Date: Sat, 30 Mar 2024 11:04:15 -0400
Subject: [PATCH 2/2] Limit controller-runtime to v0.17.2 for Go 1.21 support

Signed-off-by: Michael Shen <mshen@redhat.com>
---
 config/build_image-v5.0.0.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/build_image-v5.0.0.sh b/config/build_image-v5.0.0.sh
index 776bc46e..3326869e 100755
--- a/config/build_image-v5.0.0.sh
+++ b/config/build_image-v5.0.0.sh
@@ -39,8 +39,10 @@ go install k8s.io/code-generator/cmd/openapi-gen@${OPENAPI_GEN_VERSION}
 #########
 # ENVTEST
 #########
-# We do not enforce versioning on setup-envtest
-go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+# Latest is only compatible with Go 1.22
+# https://github.com/kubernetes-sigs/controller-runtime/issues/2744
+ENVTEST_VERSION="bf15e44028f908c790721fc8fe67c7bf2d06a611"
+go install sigs.k8s.io/controller-runtime/tools/setup-envtest@${ENVTEST_VERSION}
 
 ##############
 # govulncheck