refactor: run orchestration cluster from unified config

.github/workflows/test-local-template.yaml

@@ -55,13 +55,12 @@ jobs:
             kubectl
             make
             task
-      - name: Debug failed asdf
-        if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+      - name: CI Setup - Set test type vars
+        uses: ./.github/actions/test-type-vars
         with:
-          path: /home/runner/.asdf/downloads/make/4.3
-          name: install.log
-          if-no-files-found: error
+          chart-dir: "${{ inputs.camunda-helm-dir }}"
+          values-enterprise: false
+          values-digest: true
       - name: Create KIND cluster
         run: |
           kind create cluster --name camunda-platform-local
@@ -79,13 +78,16 @@ jobs:
         run: |
           make helm.repos-add
           helm package --dependency-update "charts/${{ inputs.camunda-helm-dir }}"
-      - name: Install Camunda Helm chart
+      - name: ⭐ Install Camunda Helm chart ⭐
         timeout-minutes: 10
         run: |
+          test -n "${{ env.TEST_HELM_DIGEST_VALUES }}" &&
+            TEST_HELM_EXTRA_ARGS="--values charts/${{ inputs.camunda-helm-dir }}/values-digest.yaml"
           helm install camunda-platform *.tgz --wait --timeout 10m0s \
             --namespace ${{ env.TEST_NAMESPACE }} \
             --values "charts/${{ inputs.camunda-helm-dir }}/test/integration/scenarios/common/values-integration-test-pull-secrets.yaml" \
-            --values "charts/${{ inputs.camunda-helm-dir }}/values-local.yaml"
+            --values "charts/${{ inputs.camunda-helm-dir }}/values-local.yaml" \
+            ${TEST_HELM_EXTRA_ARGS}
       - name: Get Pods
         if: failure()
         run: |

charts/camunda-platform-8.8/templates/NOTES.txt

@@ -67,8 +67,8 @@
 
 The Cluster itself is not exposed as a service which means that you can use `kubectl port-forward` to access the Zeebe cluster from outside Kubernetes:
 
-> kubectl port-forward svc/{{ include "orchestration.fullname" . }}-gateway 26500:26500 -n {{ .Release.Namespace }}
-> kubectl port-forward svc/{{ include "orchestration.fullname" . }}-gateway 8088:8080 -n {{ .Release.Namespace }}
+> kubectl port-forward svc/{{ include "orchestration.serviceNameGateway" . }} 26500:26500 -n {{ .Release.Namespace }}
+> kubectl port-forward svc/{{ include "orchestration.serviceNameGateway" . }} 8088:8080 -n {{ .Release.Namespace }}
 
 Now you can connect your workers and clients to `localhost:26500` for gRPC or `localhost:26500` for REST API usage.
 

charts/camunda-platform-8.8/templates/common/ingress-grpc.yaml

@@ -30,7 +30,7 @@ spec:
             pathType: {{ .Values.orchestration.ingress.grpc.pathType }}
             backend:
               service:
-                name: {{ include "orchestration.fullname" . }}-gateway
+                name: {{ include "orchestration.serviceNameGateway" . }}
                 port:
                   number: {{ .Values.orchestration.service.grpcPort }}
   {{- if .Values.orchestration.ingress.grpc.tls.enabled }}

charts/camunda-platform-8.8/templates/common/ingress-http.yaml

@@ -76,7 +76,7 @@ spec:
           # Orchestration.
           - backend:
               service:
-                name: {{ template "orchestration.fullname" . }}-gateway
+                name: {{ include "orchestration.serviceNameGateway" . }}
                 port:
                   number: {{ .Values.orchestration.service.httpPort }}
             path: {{ .Values.orchestration.contextPath }}

charts/camunda-platform-8.8/templates/connectors/configmap.yaml

@@ -36,9 +36,9 @@ data:
 
     camunda:
       client:
-        {{- $baseURLInternal := printf "%s://%s-gateway"
+        {{- $baseURLInternal := printf "%s://%s"
           (lower .Values.orchestration.readinessProbe.scheme)
-          (include "orchestration.fullname" .)
+          (include "orchestration.serviceNameGateway" .)
         }}
         rest-address: {{ printf "%s:%v%s"
           $baseURLInternal

charts/camunda-platform-8.8/templates/orchestration/_helpers.tpl

@@ -127,7 +127,7 @@ app.kubernetes.io/version: {{ include "camundaPlatform.versionLabel" (dict "base
 
 
 {{/*
-[web-modeler] Define variables related to authentication.
+[orchestration] Define variables related to authentication.
 */}}
 {{- define "orchestration.authClientId" -}}
     {{- .Values.global.identity.auth.orchestration.clientId | default "orchestration" -}}
@@ -143,14 +143,22 @@ app.kubernetes.io/version: {{ include "camundaPlatform.versionLabel" (dict "base
 
 {{- define "orchestration.enabledProfiles" -}}
     {{- $enabledProfiles := list -}}
-    {{- range $k, $v := .Values.orchestration.profiles }}
-    {{- if eq $v true }}
-        {{- $enabledProfiles = append $enabledProfiles $k }}
-    {{- end }}
+    {{- range $key, $value := .Values.orchestration.profiles }}
+        {{- if eq $value true }}
+            {{- $enabledProfiles = append $enabledProfiles $key }}
+        {{- end }}
     {{- end }}
     {{- join "," $enabledProfiles }}
 {{- end -}}
 
+{{- define "orchestration.enabledProfilesWithIdentity" -}}
+    {{- if or (eq .Values.orchestration.security.authentication.method "oidc") (eq .Values.orchestration.security.authentication.method "basic") }}
+        {{- printf "%s,%s" (include "orchestration.enabledProfiles" .) "consolidated-auth" -}}
+    {{- else }}
+        {{- include "orchestration.enabledProfiles" . | replace "identity" "auth" -}}
+    {{- end }}
+{{- end -}}
+
 {{- define "orchestration.secondaryStorage" -}}
     {{- if .Values.global.noSecondaryStorage -}}
         none
@@ -166,3 +174,45 @@ app.kubernetes.io/version: {{ include "camundaPlatform.versionLabel" (dict "base
 {{- define "orchestration.persistentSessionsEnabled" -}}
     {{- not .Values.global.noSecondaryStorage -}}
 {{- end -}}
+
+
+{{/*
+********************************************************************************
+Service names.
+********************************************************************************
+*/}}
+
+{{/*
+[orchestration] Define Orchestration Cluster service - Broker.
+*/}}
+{{- define "orchestration.serviceNameBroker" }}
+    {{- include "orchestration.fullname" . -}}
+{{- end -}}
+
+{{/*
+[orchestration] Define Orchestration Cluster service - Gateway.
+*/}}
+{{- define "orchestration.serviceNameGateway" }}
+    {{- include "orchestration.fullname" . -}}-gateway
+{{- end -}}
+
+{{/*
+[orchestration] Define Orchestration Cluster service - Broker - gRPC.
+*/}}
+{{- define "orchestration.serviceNameBrokerGRPC" }}
+    {{- include "orchestration.serviceNameBroker" . -}}:{{ .Values.orchestration.service.grpcPort }}
+{{- end -}}
+
+{{/*
+[orchestration] Define Orchestration Cluster service - Gateway - gRPC.
+*/}}
+{{- define "orchestration.serviceNameGatewayGRPC" }}
+    {{- include "orchestration.serviceNameGateway" . -}}:{{ .Values.orchestration.service.grpcPort }}
+{{- end -}}
+
+{{/*
+[orchestration] Define Orchestration Cluster service - Gateway - REST.
+*/}}
+{{- define "orchestration.serviceNameGatewayREST" }}
+    {{- include "orchestration.serviceNameGateway" . -}}:{{ .Values.orchestration.service.restPort }}
+{{- end -}}

charts/camunda-platform-8.8/templates/orchestration/configmap-unified.yaml

@@ -8,9 +8,9 @@ apiVersion: v1
 data:
   startup.sh: |
     # The Node ID depends on the StatefulSet Pod's name so it cannot be templated in the StatefulSet level.
-    # The value of "node-id" is calculated in the "startup.sh" file and exported as "VALUES_NODE_ID" env var.
-    export VALUES_NODE_ID="${VALUES_NODE_ID:-$[${K8S_NAME##*-} * {{.Values.global.multiregion.regions}} + {{.Values.global.multiregion.regionId}}]}"
-    echo "export VALUES_NODE_ID=${VALUES_NODE_ID}"
+    # The value of "node-id" is calculated in the "startup.sh" file and exported as "VALUES_ORCHESTRATION_NODE_ID" env var.
+    export VALUES_ORCHESTRATION_NODE_ID="${VALUES_ORCHESTRATION_NODE_ID:-$[${K8S_NAME##*-} * {{ .Values.global.multiregion.regions }} + {{ .Values.global.multiregion.regionId }}]}"
+    echo "export VALUES_ORCHESTRATION_NODE_ID=${VALUES_ORCHESTRATION_NODE_ID}"
 
     if [ "${ZEEBE_RESTORE}" = "true" ]; then
       exec /usr/local/camunda/bin/restore --backupId=${ZEEBE_RESTORE_FROM_BACKUP_ID}