Skip to content

Commit 5c47a41

Browse files
dprinceopenshift-merge-bot[bot]
authored andcommitted
run_with_olm: delete running deployment
Explicitly to delete any running nova-operator deployments from openstack-operator here as label selectors can change and installing a service catalog/index like this alongside openstack-operator (what CI appears to do?) is not recommended unless the initialization resource controller in openstack-operator is paused and existing deployments are cleaned properly
1 parent 44cdf74 commit 5c47a41

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,10 @@ crd-schema-check: manifests
448448
.PHONY: run_with_olm
449449
run_with_olm: export CATALOG_IMG=${CATALOG_IMAGE}
450450
run_with_olm: ## Install nova operator via olm
451+
# explicitly to delete any running nova-operator deployments from openstack-operator here as
452+
# label selectors can change and installing a service catalog/index like this alongside
453+
# openstack-operator (what CI appears to do?) is not recommended
454+
oc delete deployment nova-operator-controller-manager -n openstack-operators --ignore-not-found=true
451455
bash ci/olm.sh
452456
oc apply -f ci/olm.yaml
453457
timeout 300s bash -c "while ! (oc get csv -n openstack-operators -l operators.coreos.com/nova-operator.openstack-operators -o jsonpath='{.items[*].status.phase}' | grep Succeeded); do sleep 1; done"

0 commit comments

Comments
 (0)