From 9052c7128801fa8ebd7e56ee7e9f10488a01f19d Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Thu, 31 Oct 2024 22:55:04 +1000 Subject: [PATCH] Disable Webhooks This change builds the Operator bundle with ENABLE_WEBHOOKS=false. This is due to the duplication of webhook logic since openstack-operator imports and runs this webhook at the OpenStackControlPlane level. Therefor, having the webhook run by the service operator is a needless duplication of this webhook logic. Jira: https://issues.redhat.com/browse/OSPRH-11198 Signed-off-by: Brendan Shephard --- Dockerfile | 1 + Makefile | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 404227be..28a03e7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,5 +72,6 @@ COPY --from=builder ${DEST_ROOT}/templates ${OPERATOR_TEMPLATES} USER $USER_ID ENV PATH="/:${PATH}" +ENV ENABLE_WEBHOOKS="${ENABLE_WEBHOOKS}" ENTRYPOINT ["/manager"] diff --git a/Makefile b/Makefile index 384c7ad2..1e44fca5 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,8 @@ ENVTEST_K8S_VERSION = 1.29 # Set minimum Go version GOTOOLCHAIN_VERSION ?= go1.21.0 +ENABLE_WEBHOOKS ?= true + # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) GOBIN=$(shell go env GOPATH)/bin