Skip to content

Commit a5d0850

Browse files
Merge pull request #2843 from suhanime/HIVE-2944
[HIVE-2944] Make the cluster in e2e-pool use legacy deprovision
2 parents 3ea8a7f + fa6ab1f commit a5d0850

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

hack/e2e-common.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ function capture_manifests() {
349349
clusterdeployment \
350350
clusterimageset \
351351
clusterprovision \
352+
clusterdeprovision \
352353
clusterstate \
353354
dnszone \
354355
machinepool \

hack/e2e-pool-test.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,9 @@ oc get clusterpool ${REAL_POOL_NAME} -o json \
249249
NEW_CLUSTER_NAME=cdcci-${CLUSTER_NAME#*-}
250250
create_customization "cdc-test" "${CLUSTER_NAMESPACE}" "${NEW_CLUSTER_NAME}"
251251
oc patch cp -n $CLUSTER_NAMESPACE $REAL_POOL_NAME --type=merge -p '{"spec": {"inventory": [{"name": "cdc-test"}]}}'
252+
# Set the legacy deprovision annotation to true. This annotation will be propagated to the created cluster.
253+
# This is to ensure the legacy destroy path continues to work post AWK SDK v2 migration.
254+
oc patch cp -n $CLUSTER_NAMESPACE $REAL_POOL_NAME --type=merge -p '{"spec": {"annotations": {"hive.openshift.io/legacy-deprovision": "true"}}}'
252255
# Now we can scale up the pool so it starts creating clusters
253256
oc scale cp -n $CLUSTER_NAMESPACE $REAL_POOL_NAME --replicas=$POOL_SIZE
254257

0 commit comments

Comments
 (0)