From 1b503244b703b11cb96c357b764d1efa1270e090 Mon Sep 17 00:00:00 2001
From: Jonathan Knight <jk@thegridman.com>
Date: Mon, 3 Mar 2025 19:35:23 +0300
Subject: [PATCH] Fix Makefile

---
 Makefile                | 12 +++++++-----
 hack/setup-openshift.sh |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 026bbd34..d8597322 100644
--- a/Makefile
+++ b/Makefile
@@ -1646,21 +1646,23 @@ ifeq (false,$(OPERATOR_HA))
 	cd $(BUILD_DEPLOY)/manager && $(KUSTOMIZE) edit add patch --kind Deployment --name controller-manager --path single-replica-patch.yaml
 endif
 	kubectl -n $(OPERATOR_NAMESPACE) create secret generic coherence-webhook-server-cert || true
-	$(call deployOperator)
+ifeq ("$(DEPLOY_DOCKER_CONFIG_JSON)","")
+	$(KUSTOMIZE) build $(BUILD_DEPLOY)/default | kubectl apply -f -
+else
+	$(KUSTOMIZE) build $(BUILD_DEPLOY)/overlays/ci | kubectl apply -f -
+endif
 	sleep 5
 
+
 .PHONY: just-deploy
 just-deploy: ensure-pull-secret ## Deploy the Coherence Operator without rebuilding anything
 	$(call prepare_deploy,$(OPERATOR_IMAGE),$(OPERATOR_NAMESPACE))
-	$(call deployOperator)
-
-define deployOperator
 ifeq ("$(DEPLOY_DOCKER_CONFIG_JSON)","")
 	$(KUSTOMIZE) build $(BUILD_DEPLOY)/default | kubectl apply -f -
 else
 	$(KUSTOMIZE) build $(BUILD_DEPLOY)/overlays/ci | kubectl apply -f -
 endif
-endef
+
 
 .PHONY: ensure-pull-secret
 ensure-pull-secret:
diff --git a/hack/setup-openshift.sh b/hack/setup-openshift.sh
index 6c515d40..7f94e612 100644
--- a/hack/setup-openshift.sh
+++ b/hack/setup-openshift.sh
@@ -14,3 +14,6 @@ export JIB_EXECUTABLE=$(which podman)
 export USE_PODMAN=true
 export LOCAL_BUILDAH=true
 export DEPLOY_DOCKER_CONFIG_JSON=$XDG_RUNTIME_DIR/containers/auth.json
+
+echo "OpenShift setup done"
+echo "Run podman login iad.ocir.io"