fix: changed restAddress in Tasklist with helper function (#2152)

camunda · Jul 26, 2024 · 9e45221 · 9e45221
1 parent dcf0a93
commit 9e45221
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/charts/camunda-platform-alpha/templates/camunda/_helpers.tpl b/charts/camunda-platform-alpha/templates/camunda/_helpers.tpl
@@ -517,6 +517,20 @@ Zeebe templates.
   {{- printf "%s://%s" $proto .Values.zeebeGateway.ingress.grpc.host -}}
 {{- end -}}
 
+{{/*
+[camunda-platform] Zeebe Gateway REST internal URL.
+*/}}
+{{ define "camundaPlatform.zeebeGatewayRESTURL" }}
+  {{- if .Values.zeebe.enabled -}}
+    {{-
+      printf "http://%s:%v%s"
+        (include "zeebe.fullname.gateway" .)
+        .Values.zeebeGateway.service.restPort
+        (.Values.zeebeGateway.contextPath | default "")
+    -}}
+  {{- end -}}
+{{- end -}}
+
 
 {{/*
 ********************************************************************************

diff --git a/charts/camunda-platform-alpha/templates/tasklist/configmap.yaml b/charts/camunda-platform-alpha/templates/tasklist/configmap.yaml
@@ -109,7 +109,7 @@ data:
       zeebe:
         # Gateway address
         gatewayAddress: "{{ tpl .Values.global.zeebeClusterName . }}-gateway:{{ .Values.zeebeGateway.service.grpcPort }}"
-        restAddress: "http://{{ tpl .Values.global.zeebeClusterName . }}-gateway:{{ .Values.zeebeGateway.service.restPort }}"
+        restAddress: {{ include "camundaPlatform.zeebeGatewayRESTURL" . | quote }}
       {{- if .Values.tasklist.retention.enabled }}
       archiver:
         ilmEnabled: true

diff --git a/charts/camunda-platform-latest/templates/camunda/_helpers.tpl b/charts/camunda-platform-latest/templates/camunda/_helpers.tpl
@@ -501,6 +501,20 @@ Zeebe templates.
   {{- printf "%s://%s" $proto .Values.zeebeGateway.ingress.grpc.host -}}
 {{- end -}}
 
+{{/*
+[camunda-platform] Zeebe Gateway REST internal URL.
+*/}}
+{{ define "camundaPlatform.zeebeGatewayRESTURL" }}
+  {{- if .Values.zeebe.enabled -}}
+    {{-
+      printf "http://%s:%v%s"
+        (include "zeebe.fullname.gateway" .)
+        .Values.zeebeGateway.service.restPort
+        (.Values.zeebeGateway.contextPath | default "")
+    -}}
+  {{- end -}}
+{{- end -}}
+
 
 {{/*
 ********************************************************************************

diff --git a/charts/camunda-platform-latest/templates/tasklist/configmap.yaml b/charts/camunda-platform-latest/templates/tasklist/configmap.yaml
@@ -108,7 +108,7 @@ data:
       zeebe:
         # Broker contact point
         brokerContactPoint: "{{ tpl .Values.global.zeebeClusterName . }}-gateway:{{ .Values.zeebeGateway.service.grpcPort }}"
-        restAddress: "http://{{ tpl .Values.global.zeebeClusterName . }}-gateway:{{ .Values.zeebeGateway.service.restPort }}"
+        restAddress: {{ include "camundaPlatform.zeebeGatewayRESTURL" . | quote }}
       {{- if .Values.tasklist.retention.enabled }}
       archiver:
         ilmEnabled: true