Skip to content

Commit 8838700

Browse files
authored
Remove the usage of deprecated features (#618)
* Remove the usage of deprecated features * Remove deprecated disconnected annotation
1 parent fa17dc6 commit 8838700

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

bundle/manifests/open-liberty.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ metadata:
9292
categories: Application Runtime
9393
certified: "true"
9494
containerImage: icr.io/appcafe/open-liberty-operator:daily
95-
createdAt: "2024-08-28T20:22:33Z"
95+
createdAt: "2024-08-30T20:14:55Z"
9696
description: Deploy and manage containerized Liberty applications
9797
features.operators.openshift.io/disconnected: "true"
9898
features.operators.openshift.io/fips-compliant: "true"

doc/user-guide-v1.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1383,14 +1383,14 @@ spec:
13831383
- weight: 60
13841384
preference:
13851385
matchExpressions:
1386-
- key: failure-domain.beta.kubernetes.io/zone
1386+
- key: topology.kubernetes.io/zone
13871387
operator: In
13881388
values:
13891389
- zoneA
13901390
- weight: 20
13911391
preference:
13921392
matchExpressions:
1393-
- key: failure-domain.beta.kubernetes.io/zone
1393+
- key: topology.kubernetes.io/zone
13941394
operator: In
13951395
values:
13961396
- zoneB
@@ -1416,7 +1416,7 @@ spec:
14161416
operator: In
14171417
values:
14181418
- Service-A
1419-
topologyKey: failure-domain.beta.kubernetes.io/zone
1419+
topologyKey: topology.kubernetes.io/zone
14201420
podAntiAffinity:
14211421
preferredDuringSchedulingIgnoredDuringExecution:
14221422
- weight: 100

scripts/dev.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ main() {
125125
setup_knative_serving
126126
install_cert_manager
127127
add_affinity_label_to_node
128-
create_image_content_source_policy
128+
create_image_digest_mirror_set
129129
elif [[ "$COMMAND" == "scorecard" ]]; then
130130
run_scorecard
131131
elif [[ "$COMMAND" == "deploy" ]]; then
@@ -441,16 +441,16 @@ add_affinity_label_to_node() {
441441
fi
442442
}
443443

444-
create_image_content_source_policy() {
445-
if ! oc get imagecontentsourcepolicy | grep mirror-config >/dev/null; then
446-
echo "Adding ImageContentSourcePolicy to mirror to staging repository..."
444+
create_image_digest_mirror_set() {
445+
if ! oc get ImageDigestMirrorSet | grep mirror-config >/dev/null; then
446+
echo "Adding ImageDigestMirrorSet to mirror to staging repository..."
447447
cat <<EOF | oc apply -f -
448-
apiVersion: operator.openshift.io/v1alpha1
449-
kind: ImageContentSourcePolicy
448+
apiVersion: config.openshift.io/v1
449+
kind: ImageDigestMirrorSet
450450
metadata:
451451
name: mirror-config
452452
spec:
453-
repositoryDigestMirrors:
453+
imageDigestMirrors:
454454
- mirrors:
455455
- cp.stg.icr.io/cp
456456
source: cp.icr.io/cp
@@ -460,7 +460,7 @@ spec:
460460
EOF
461461
echo
462462
else
463-
echo "ImageContentSourcePolicy to mirror to staging repository already exists."
463+
echo "ImageDigestMirrorSet to mirror to staging repository already exists."
464464
fi
465465
}
466466

0 commit comments

Comments
 (0)