Remove the usage of deprecated features (#618)

* Remove the usage of deprecated features * Remove deprecated disconnected annotation
OpenLiberty · Aug 30, 2024 · 8838700 · 8838700
1 parent fa17dc6
commit 8838700
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/bundle/manifests/open-liberty.clusterserviceversion.yaml b/bundle/manifests/open-liberty.clusterserviceversion.yaml
@@ -92,7 +92,7 @@ metadata:
     categories: Application Runtime
     certified: "true"
     containerImage: icr.io/appcafe/open-liberty-operator:daily
-    createdAt: "2024-08-28T20:22:33Z"
+    createdAt: "2024-08-30T20:14:55Z"
     description: Deploy and manage containerized Liberty applications
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "true"

diff --git a/doc/user-guide-v1.adoc b/doc/user-guide-v1.adoc
@@ -1383,14 +1383,14 @@ spec:
       - weight: 60
         preference:
           matchExpressions:
-          - key: failure-domain.beta.kubernetes.io/zone
+          - key: topology.kubernetes.io/zone
             operator: In
             values:
             - zoneA
       - weight: 20
         preference:
           matchExpressions:
-          - key: failure-domain.beta.kubernetes.io/zone
+          - key: topology.kubernetes.io/zone
             operator: In
             values:
             - zoneB
@@ -1416,7 +1416,7 @@ spec:
             operator: In
             values:
             - Service-A
-        topologyKey: failure-domain.beta.kubernetes.io/zone
+        topologyKey: topology.kubernetes.io/zone
     podAntiAffinity:
       preferredDuringSchedulingIgnoredDuringExecution:
       - weight: 100

diff --git 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
@@ -441,16 +441,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
@@ -460,7 +460,7 @@ spec:
 EOF
     echo
   else
-    echo "ImageContentSourcePolicy to mirror to staging repository already exists."
+    echo "ImageDigestMirrorSet to mirror to staging repository already exists."
   fi
 }