removing webmodeler.identityBaseurl helper function

camunda · Mar 6, 2025 · 80d381d · 80d381d
1 parent b5f3104
commit 80d381d
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 98 deletions.
diff --git a/charts/camunda-platform-8.2/templates/web-modeler/deployment-restapi.yaml b/charts/camunda-platform-8.2/templates/web-modeler/deployment-restapi.yaml
@@ -94,7 +94,7 @@ spec:
           - name: RESTAPI_OAUTH2_TOKEN_ISSUER_BACKEND_URL
             value: {{ include "camundaPlatform.issuerBackendUrl" . | quote }}
           - name: RESTAPI_IDENTITY_BASE_URL
-            value: {{ include "camundaPlatform.identityURL" . | quote }}
+            value: {{ include "webModeler.identityBaseUrl" . | quote }}
         {{- with .Values.webModeler.restapi.env }}
             {{- tpl (toYaml .) $ | nindent 10 }}
         {{- end }}

diff --git a/charts/camunda-platform-8.2/templates/web-modeler/deployment-webapp.yaml b/charts/camunda-platform-8.2/templates/web-modeler/deployment-webapp.yaml
@@ -97,7 +97,7 @@ spec:
                 name: {{ include "webModeler.fullname" . }}
                 key: pusher-app-key
           - name: IDENTITY_BASE_URL
-            value: {{ include "camundaPlatform.identityURL" . | quote }}
+            value: {{ include "webModeler.identityBaseUrl" . | quote }}
         {{- with .Values.webModeler.webapp.env }}
             {{- tpl (toYaml .) $ | nindent 10 }}
         {{- end }}

diff --git a/charts/camunda-platform-8.3/templates/web-modeler/_helpers.tpl b/charts/camunda-platform-8.3/templates/web-modeler/_helpers.tpl
@@ -245,22 +245,6 @@ Define match labels for Web Modeler websockets to be used in matchLabels selecto
 {{- include "common.names.dependency.fullname" (dict "chartName" "postgresql" "chartValues" .Values.postgresql "context" $) -}}
 {{- end -}}
 
-{{/*
-[web-modeler] Create the base URL of the Identity API (using backchannel communication)
-*/}}
-{{- define "webModeler.identityBaseUrl" -}}
-  {{- if .Values.global.identity.service.url -}}
-    {{- .Values.global.identity.service.url -}}
-  {{- else -}}
-    {{-
-      printf "http://%s:%v%s"
-        (include "identity.fullname" .Subcharts.identity)
-        .Values.identity.service.port
-        (default "" .Values.identity.contextPath)
-    -}}
-  {{- end -}}
-{{- end -}}
-
 {{/*
 [web-modeler] Create the context path for the WebSocket app (= configured context path for the webapp + suffix "-ws").
 */}}

diff --git a/charts/camunda-platform-8.4/templates/web-modeler/_helpers.tpl b/charts/camunda-platform-8.4/templates/web-modeler/_helpers.tpl
@@ -246,22 +246,6 @@ Define match labels for Web Modeler websockets to be used in matchLabels selecto
 {{- include "common.names.dependency.fullname" (dict "chartName" "postgresql" "chartValues" .Values.postgresql "context" $) -}}
 {{- end -}}
 
-{{/*
-[web-modeler] Create the base URL of the Identity API (using backchannel communication)
-*/}}
-{{- define "webModeler.identityBaseUrl" -}}
-  {{- if .Values.global.identity.service.url -}}
-    {{- .Values.global.identity.service.url -}}
-  {{- else -}}
-    {{-
-      printf "http://%s:%v%s"
-        (include "identity.fullname" .Subcharts.identity)
-        .Values.identity.service.port
-        (default "" .Values.identity.contextPath)
-    -}}
-  {{- end -}}
-{{- end -}}
-
 {{/*
 [web-modeler] Create the context path for the WebSocket app (= configured context path for the webapp + suffix "-ws").
 */}}

diff --git a/charts/camunda-platform-8.5/templates/web-modeler/_helpers.tpl b/charts/camunda-platform-8.5/templates/web-modeler/_helpers.tpl
@@ -276,22 +276,6 @@ Define match labels for Web Modeler websockets to be used in matchLabels selecto
   {{- include "common.names.dependency.fullname" (dict "chartName" "postgresql" "chartValues" .Values.postgresql "context" $) -}}
 {{- end -}}
 
-{{/*
-[web-modeler] Create the base URL of the Identity API (using backchannel communication)
-*/}}
-{{- define "webModeler.identityBaseUrl" -}}
-  {{- if .Values.global.identity.service.url -}}
-    {{- .Values.global.identity.service.url -}}
-  {{- else -}}
-    {{-
-      printf "http://%s:%v%s"
-        (include "identity.fullname" .)
-        .Values.identity.service.port
-        (default "" .Values.identity.contextPath)
-    -}}
-  {{- end -}}
-{{- end -}}
-
 {{/*
 [web-modeler] Create the context path for the WebSocket app (= configured context path for the webapp + suffix "-ws").
 */}}

diff --git a/charts/camunda-platform-8.6/templates/web-modeler/_helpers.tpl b/charts/camunda-platform-8.6/templates/web-modeler/_helpers.tpl
@@ -276,22 +276,6 @@ Define match labels for Web Modeler websockets to be used in matchLabels selecto
   {{- include "common.names.dependency.fullname" (dict "chartName" "postgresql" "chartValues" .Values.postgresql "context" $) -}}
 {{- end -}}
 
-{{/*
-[web-modeler] Create the base URL of the Identity API (using backchannel communication)
-*/}}
-{{- define "webModeler.identityBaseUrl" -}}
-  {{- if .Values.global.identity.service.url -}}
-    {{- .Values.global.identity.service.url -}}
-  {{- else -}}
-    {{-
-      printf "http://%s:%v%s"
-        (include "identity.fullname" .)
-        .Values.identity.service.port
-        (default "" .Values.identity.contextPath)
-    -}}
-  {{- end -}}
-{{- end -}}
-
 {{/*
 [web-modeler] Create the context path for the WebSocket app (= configured context path for the webapp + suffix "-ws").
 */}}

diff --git a/charts/camunda-platform-alpha-8.8/templates/web-modeler/_helpers.tpl b/charts/camunda-platform-alpha-8.8/templates/web-modeler/_helpers.tpl
@@ -276,22 +276,6 @@ Define match labels for Web Modeler websockets to be used in matchLabels selecto
   {{- include "common.names.dependency.fullname" (dict "chartName" "webModelerPostgresql" "chartValues" .Values.webModelerPostgresql "context" $) -}}
 {{- end -}}
 
-{{/*
-[web-modeler] Create the base URL of the Identity API (using backchannel communication)
-*/}}
-{{- define "webModeler.identityBaseUrl" -}}
-  {{- if .Values.global.identity.service.url -}}
-    {{- .Values.global.identity.service.url -}}
-  {{- else -}}
-    {{-
-      printf "http://%s:%v%s"
-        (include "identity.fullname" .)
-        .Values.identity.service.port
-        (default "" .Values.identity.contextPath)
-    -}}
-  {{- end -}}
-{{- end -}}
-
 {{/*
 [web-modeler] Create the context path for the WebSocket app (= configured context path for the webapp + suffix "-ws").
 */}}

diff --git a/charts/camunda-platform-alpha/templates/web-modeler/_helpers.tpl b/charts/camunda-platform-alpha/templates/web-modeler/_helpers.tpl
@@ -276,22 +276,6 @@ Define match labels for Web Modeler websockets to be used in matchLabels selecto
   {{- include "common.names.dependency.fullname" (dict "chartName" "postgresql" "chartValues" .Values.postgresql "context" $) -}}
 {{- end -}}
 
-{{/*
-[web-modeler] Create the base URL of the Identity API (using backchannel communication)
-*/}}
-{{- define "webModeler.identityBaseUrl" -}}
-  {{- if .Values.global.identity.service.url -}}
-    {{- .Values.global.identity.service.url -}}
-  {{- else -}}
-    {{-
-      printf "http://%s:%v%s"
-        (include "identity.fullname" .)
-        .Values.identity.service.port
-        (default "" .Values.identity.contextPath)
-    -}}
-  {{- end -}}
-{{- end -}}
-
 {{/*
 [web-modeler] Create the context path for the WebSocket app (= configured context path for the webapp + suffix "-ws").
 */}}