From a49b866a122aca91c1447e01f0d16d7ee429a351 Mon Sep 17 00:00:00 2001
From: Melissa Lee <halim.lee@ibm.com>
Date: Mon, 26 Aug 2024 11:26:05 -0700
Subject: [PATCH] Remove the usage of deprecated features

---
 .../runtime-component.clusterserviceversion.yaml |  2 +-
 config/certmanager/certificate.yaml              |  1 -
 scripts/dev.sh                                   | 16 ++++++++--------
 utils/utils_test.go                              |  7 ++++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bundle/manifests/runtime-component.clusterserviceversion.yaml b/bundle/manifests/runtime-component.clusterserviceversion.yaml
index 5eec68a89..40896e205 100644
--- a/bundle/manifests/runtime-component.clusterserviceversion.yaml
+++ b/bundle/manifests/runtime-component.clusterserviceversion.yaml
@@ -71,7 +71,7 @@ metadata:
     categories: Application Runtime
     certified: "true"
     containerImage: icr.io/appcafe/runtime-component-operator:daily
-    createdAt: "2024-08-23T13:51:42Z"
+    createdAt: "2024-08-26T15:51:08Z"
     description: Deploys any runtime component with dynamic and auto-tuning configuration
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "true"
diff --git a/config/certmanager/certificate.yaml b/config/certmanager/certificate.yaml
index 58db114fa..af32cab61 100644
--- a/config/certmanager/certificate.yaml
+++ b/config/certmanager/certificate.yaml
@@ -19,7 +19,6 @@ spec:
   # $(SERVICE_NAME) and $(SERVICE_NAMESPACE) will be substituted by kustomize
   dnsNames:
   - $(SERVICE_NAME).$(SERVICE_NAMESPACE).svc
-  - $(SERVICE_NAME).$(SERVICE_NAMESPACE).svc.cluster.local
   issuerRef:
     kind: Issuer
     name: selfsigned-issuer
diff --git a/scripts/dev.sh b/scripts/dev.sh
index bc279f483..ec6720f47 100755
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@@ -125,7 +125,7 @@ main() {
      setup_knative_serving
      install_cert_manager
      add_affinity_label_to_node
-     create_image_content_source_policy
+     create_image_digest_mirror_set
   elif [[ "$COMMAND" == "scorecard" ]]; then
      run_scorecard
   elif [[ "$COMMAND" == "deploy" ]]; then
@@ -442,16 +442,16 @@ add_affinity_label_to_node() {
   fi
 }
 
-create_image_content_source_policy() {
-  if ! oc get imagecontentsourcepolicy | grep mirror-config >/dev/null; then
-    echo "Adding ImageContentSourcePolicy to mirror to staging repository..."
+create_image_digest_mirror_set() {
+  if ! oc get ImageDigestMirrorSet | grep mirror-config >/dev/null; then
+    echo "Adding ImageDigestMirrorSet to mirror to staging repository..."
     cat <<EOF | oc apply -f -
-apiVersion: operator.openshift.io/v1alpha1
-kind: ImageContentSourcePolicy
+apiVersion: config.openshift.io/v1
+kind: ImageDigestMirrorSet
 metadata:
     name: mirror-config
 spec:
-    repositoryDigestMirrors:
+  imageDigestMirrors:
     - mirrors:
       - cp.stg.icr.io/cp
       source: cp.icr.io/cp
@@ -461,7 +461,7 @@ spec:
 EOF
     echo
   else
-    echo "ImageContentSourcePolicy to mirror to staging repository already exists."
+    echo "ImageDigestMirrorSet to mirror to staging repository already exists."
   fi
 }
 
diff --git a/utils/utils_test.go b/utils/utils_test.go
index e39d31029..5ab6460c5 100644
--- a/utils/utils_test.go
+++ b/utils/utils_test.go
@@ -1,12 +1,13 @@
 package utils
 
 import (
-	appstacksv1 "github.com/application-stacks/runtime-component-operator/api/v1"
 	"os"
 	"reflect"
 	"strconv"
 	"testing"
 
+	appstacksv1 "github.com/application-stacks/runtime-component-operator/api/v1"
+
 	"github.com/application-stacks/runtime-component-operator/common"
 	routev1 "github.com/openshift/api/route/v1"
 	prometheusv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
@@ -210,7 +211,7 @@ func partialTestCustomizeNodeAffinity(t *testing.T) {
 			Preference: corev1.NodeSelectorTerm{
 				MatchExpressions: []corev1.NodeSelectorRequirement{
 					{
-						Key:      "failure-domain.beta.kubernetes.io/zone",
+						Key:      "topology.kubernetes.io/zone",
 						Operator: corev1.NodeSelectorOpIn,
 						Values:   []string{"zoneB"},
 					},
@@ -259,7 +260,7 @@ func partialTestCustomizePodAffinity(t *testing.T) {
 	selectorB := makeInLabelSelector("service", []string{"Service-B"})
 	// required during scheduling ignored during execution
 	rDSIDE := []corev1.PodAffinityTerm{
-		{LabelSelector: &selectorA, TopologyKey: "failure-domain.beta.kubernetes.io/zone"},
+		{LabelSelector: &selectorA, TopologyKey: "topology.kubernetes.io/zone"},
 	}
 	// preferred during scheduling ignored during execution
 	pDSIDE := []corev1.WeightedPodAffinityTerm{