From d1eefaa8141e09e89424f21cad053241225e99bc Mon Sep 17 00:00:00 2001
From: Dave Paroulek <david.paroulek@camunda.com>
Date: Tue, 9 Jan 2024 19:59:15 -0500
Subject: [PATCH] Improve external-urls-all and remove elasticsearch from
 values.yaml

---
 include/camunda.mk                            |  4 +--
 include/ingress-nginx.mk                      |  4 +--
 .../camunda-values-multiregion.tpl.yaml       | 28 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/camunda.mk b/include/camunda.mk
index 3540fedb..137a2b97 100644
--- a/include/camunda.mk
+++ b/include/camunda.mk
@@ -35,8 +35,8 @@ config-keycloak: keycloak-password
 
 .PHONY: zeebe-password
 zeebe-password:
-	$(eval kcPassword := $(shell kubectl get secret --namespace $(namespace) "$(release)-zeebe-identity-secret" -o jsonpath="{.data.zeebe-secret}" | base64 --decode))
-	@echo Zeebe Identity password: $(kcPassword)
+	$(eval zeebePassword := $(shell kubectl get secret --namespace $(namespace) "$(release)-zeebe-identity-secret" -o jsonpath="{.data.zeebe-secret}" | base64 --decode))
+	@echo Zeebe Identity password: $(zeebePassword)
 
 .PHONY: connectors-password
 connectors-password:
diff --git a/include/ingress-nginx.mk b/include/ingress-nginx.mk
index cd656ee9..6b132edd 100644
--- a/include/ingress-nginx.mk
+++ b/include/ingress-nginx.mk
@@ -67,12 +67,12 @@ external-urls-with-fqdn: fqdn
 	@echo To deploy to the cluster: make port-zeebe, then: zbctl status --address localhost:26500 --insecure
 
 .PHONY: external-urls-all
-external-urls-all: fqdn
+external-urls-all: fqdn zeebe-password
 	@echo Keycloak: https://$(fqdn)/auth
 	@echo Identity: https://$(fqdn)/identity
 	@echo Operate: https://$(fqdn)/operate
 	@echo Tasklist: https://$(fqdn)/tasklist
 	@echo Optimize: https://$(fqdn)/optimize
 	@echo Connectors: https://$(fqdn)/inbound
-	@echo Zeebe GRPC: zbctl status --address $(fqdn):443
+	@echo Zeebe GRPC: zbctl status --address $(fqdn):443 --authzUrl  https://$(fqdn):443/auth/realms/camunda-platform/protocol/openid-connect/token --clientId zeebe --clientSecret $(zeebePassword)
 	@echo Auth URL: https://$(fqdn):443/auth/realms/camunda-platform/protocol/openid-connect/token
diff --git a/multi-region/include/camunda-values-multiregion.tpl.yaml b/multi-region/include/camunda-values-multiregion.tpl.yaml
index adf0a856..a68dc4d9 100644
--- a/multi-region/include/camunda-values-multiregion.tpl.yaml
+++ b/multi-region/include/camunda-values-multiregion.tpl.yaml
@@ -128,20 +128,20 @@ zeebe:
     - name: ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH2_ARGS_INDEX_PREFIX
       value: "zeebe-record"
 
-elasticsearch:
-  enabled: true
-  imageTag: 7.17.3
-  replicas: 1
-  minimumMasterNodes: 1
-  # Allow no backup for single node setups
-  clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
-  resources:
-    requests:
-      cpu: "100m"
-      memory: "512M"
-    limits:
-      cpu: "1000m"
-      memory: "2Gi"
+#elasticsearch:
+#  enabled: true
+#  imageTag: 7.17.3
+#  replicas: 1
+#  minimumMasterNodes: 1
+#  # Allow no backup for single node setups
+#  clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
+#  resources:
+#    requests:
+#      cpu: "100m"
+#      memory: "512M"
+#    limits:
+#      cpu: "1000m"
+#      memory: "2Gi"