Skip to content

Commit

Permalink
Merge pull request #639 from abays/olm_webhook_cleanup
Browse files Browse the repository at this point in the history
Automate OLM cleanup for running local operator w/ webhooks
  • Loading branch information
openshift-merge-bot[bot] authored Oct 16, 2024
2 parents 4aed06e + 2902d3b commit 32b669e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
11 changes: 5 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,11 @@ operator-lint: gowork ## Runs operator-lint
go vet -vettool=$(LOCALBIN)/operator-lint ./... ./api/...

# Used for webhook testing
# Please ensure the glance-controller-manager deployment and
# webhook definitions are removed from the csv before running
# this. Also, cleanup the webhook configuration for local testing
# before deplying with olm again.
# $oc delete -n openstack validatingwebhookconfiguration/vglance.kb.io
# $oc delete -n openstack mutatingwebhookconfiguration/mglance.kb.io
# The configure_local_webhooks.sh script below will remove any OLM webhooks
# for the operator and also scale its deployment replicas down to 0 so that
# the operator can run locally.
# Make sure to cleanup the webhook configuration for local testing by running
# ./hack/clean_local_webhook.sh before deplying with OLM again.
SKIP_CERT ?=false
.PHONY: run-with-webhook
run-with-webhook: export METRICS_PORT?=8080
Expand Down
8 changes: 8 additions & 0 deletions hack/configure_local_webhook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,11 @@ webhooks:
EOF_CAT

oc apply -n openstack -f ${TMPDIR}/patch_webhook_configurations.yaml

# Scale-down operator deployment replicas to zero and remove OLM webhooks
CSV_NAME="$(oc get csv -n openstack-operators -l operators.coreos.com/glance-operator.openstack-operators -o name)"

if [ -n "${CSV_NAME}" ]; then
oc patch "${CSV_NAME}" -n openstack-operators --type=json -p="[{'op': 'replace', 'path': '/spec/install/spec/deployments/0/spec/replicas', 'value': 0}]"
oc patch "${CSV_NAME}" -n openstack-operators --type=json -p="[{'op': 'replace', 'path': '/spec/webhookdefinitions', 'value': []}]"
fi

0 comments on commit 32b669e

Please sign in to comment.