@@ -965,7 +965,6 @@ copyright: ## Check copyright headers
965965run : export COHERENCE_IMAGE := $(COHERENCE_IMAGE )
966966run : create-namespace # # run the Operator locally
967967 go run -ldflags " $( LDFLAGS) " ./runner/main.go operator --skip-service-suspend=true --coherence-dev-mode=true \
968- --cert-type=self-signed --webhook-service=host.docker.internal \
969968 2>&1 | tee $(TEST_LOGS_DIR ) /operator-debug.out
970969
971970# ----------------------------------------------------------------------------------------------------------------------
@@ -988,8 +987,7 @@ run-debug: export COHERENCE_IMAGE := $(COHERENCE_IMAGE)
988987run-debug : export OPERATOR_IMAGE := $(OPERATOR_IMAGE )
989988run-debug : create-namespace # # run the Operator locally with Delve debugger
990989 dlv debug ./runner --headless --listen=:2345 --api-version=2 --accept-multiclient \
991- -- --skip-service-suspend=true --coherence-dev-mode=true \
992- --cert-type=self-signed --webhook-service=host.docker.internal
990+ -- --skip-service-suspend=true --coherence-dev-mode=true
993991
994992# ----------------------------------------------------------------------------------------------------------------------
995993# Run the Operator locally in debug mode after deleting and recreating
@@ -1709,8 +1707,6 @@ prepare-network-policies:
17091707 $(SED ) -e ' s/172.18.0.2/${IP1}/g' $(BUILD_OUTPUT ) /network-policies/manifests/allow-k8s-api-server.yaml
17101708 $(SED ) -e ' s/10.96.0.1/${IP2}/g' $(BUILD_OUTPUT ) /network-policies/manifests/allow-k8s-api-server.yaml
17111709 $(SED ) -e ' s/6443/${API_PORT}/g' $(BUILD_OUTPUT ) /network-policies/manifests/allow-k8s-api-server.yaml
1712- $(SED ) -e ' s/172.18.0.2/${IP1}/g' $(BUILD_OUTPUT ) /network-policies/manifests/allow-webhook-ingress-from-api-server.yaml
1713- $(SED ) -e ' s/10.96.0.1/${IP2}/g' $(BUILD_OUTPUT ) /network-policies/manifests/allow-webhook-ingress-from-api-server.yaml
17141710
17151711# ----------------------------------------------------------------------------------------------------------------------
17161712# Uninstall the network policies from the examples
@@ -1887,7 +1883,6 @@ endif
18871883ifeq (false,$(OPERATOR_HA ) )
18881884 cd $(BUILD_DEPLOY)/manager && $(KUSTOMIZE) edit add patch --kind Deployment --name controller-manager --path single-replica-patch.yaml
18891885endif
1890- $(KUBECTL_CMD) -n $(OPERATOR_NAMESPACE) create secret generic coherence-webhook-server-cert || true
18911886ifeq ("$(OPERATOR_IMAGE_REGISTRY ) ","$(ORACLE_REGISTRY ) ")
18921887 $(KUSTOMIZE) build $(BUILD_DEPLOY)/default | $(KUBECTL_CMD) apply -f -
18931888else
@@ -1937,7 +1932,6 @@ deploy-debug: prepare-deploy-debug create-namespace $(TOOLS_BIN)/kustomize ##
19371932ifneq (,$(WATCH_NAMESPACE ) )
19381933 cd $(BUILD_DEPLOY)/manager && $(KUSTOMIZE) edit add configmap env-vars --from-literal WATCH_NAMESPACE=$(WATCH_NAMESPACE)
19391934endif
1940- $(KUBECTL_CMD) -n $(OPERATOR_NAMESPACE) create secret generic coherence-webhook-server-cert || true
19411935 $(KUSTOMIZE) build $(BUILD_DEPLOY)/default | $(KUBECTL_CMD) apply -f -
19421936 sleep 5
19431937 @echo ""
@@ -1995,7 +1989,7 @@ endef
19951989# Un-deploy controller from the configured Kubernetes cluster in ~/.kube/config
19961990# ----------------------------------------------------------------------------------------------------------------------
19971991.PHONY : undeploy
1998- undeploy : $(BUILD_PROPS ) $(BUILD_TARGETS ) /manifests $(TOOLS_BIN ) /kustomize uninstall-webhooks # # Undeploy the Coherence Operator
1992+ undeploy : $(BUILD_PROPS ) $(BUILD_TARGETS ) /manifests $(TOOLS_BIN ) /kustomize # # Undeploy the Coherence Operator
19991993 @echo " Undeploy Coherence Operator..."
20001994 $(call prepare_deploy,$(OPERATOR_IMAGE ) ,$(OPERATOR_NAMESPACE ) )
20011995 $(KUSTOMIZE ) build $(BUILD_DEPLOY ) /default | $(KUBECTL_CMD ) delete -f - || true
@@ -2005,12 +1999,6 @@ undeploy: $(BUILD_PROPS) $(BUILD_TARGETS)/manifests $(TOOLS_BIN)/kustomize unins
20051999 $(KUSTOMIZE ) build $(BUILD_DEPLOY ) /crd | $(KUBECTL_CMD ) delete --force -f - || true
20062000 @echo " Uninstall CRDs completed"
20072001
2008- .PHONY : uninstall-webhooks
2009- uninstall-webhooks :
2010- $(KUBECTL_CMD ) -n $(OPERATOR_NAMESPACE ) delete secret coherence-webhook-server-cert || true
2011- $(KUBECTL_CMD ) delete mutatingwebhookconfiguration coherence-operator-mutating-webhook-configuration || true
2012- $(KUBECTL_CMD ) delete validatingwebhookconfiguration coherence-operator-validating-webhook-configuration || true
2013-
20142002# ----------------------------------------------------------------------------------------------------------------------
20152003# Tail the deployed operator logs.
20162004# ----------------------------------------------------------------------------------------------------------------------
0 commit comments