Fix Makefile

oracle · Mar 3, 2025 · 1b50324 · 1b50324
1 parent b7274f7
commit 1b50324
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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"