Skip to content

Commit

Permalink
Improve external-urls-all and remove elasticsearch from values.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
upgradingdave committed Jan 10, 2024
1 parent 7ae41fc commit d1eefaa
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions include/camunda.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions include/ingress-nginx.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
28 changes: 14 additions & 14 deletions multi-region/include/camunda-values-multiregion.tpl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"



Expand Down

0 comments on commit d1eefaa

Please sign in to comment.