Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: changing helper function for identityURL #3084

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+33 −117
Open

fix: changing helper function for identityURL #3084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
248be35
fix: changing helper function for identityURL
hamza-m-masood Mar 6, 2025
39082ed
chore: chart chores
distro-ci[bot] Mar 6, 2025
b5f3104
using camundaPlatform.identityURL instead of webModeler.identityURL
hamza-m-masood Mar 6, 2025
80d381d
removing webmodeler.identityBaseurl helper function
hamza-m-masood Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion charts/camunda-platform-8.3/templates/camunda/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,9 @@ Identity templates.
[camunda-platform] Identity internal URL.
*/}}
{{ define "camundaPlatform.identityURL" }}
{{- if .Values.identity.enabled -}}
{{- if .Values.global.identity.service.url -}}
{{- .Values.global.identity.service.url -}}
{{- else -}}
{{-
printf "http://%s:%v%s"
(include "identity.fullname" .Subcharts.identity)
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.3/templates/optimize/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ spec:
- name: CAMUNDA_OPTIMIZE_IDENTITY_AUDIENCE
value: "optimize-api"
- name: CAMUNDA_OPTIMIZE_IDENTITY_BASE_URL
value: {{ include "webModeler.identityBaseUrl" . | quote }}
value: {{ include "camundaPlatform.identityURL" . | quote }}
- name: CAMUNDA_OPTIMIZE_API_AUDIENCE
value: "optimize-api"
- name: SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI
Expand Down
16 changes: 0 additions & 16 deletions charts/camunda-platform-8.3/templates/web-modeler/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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").
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.3/templates/web-modeler/deployment-restapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ spec:
- name: RESTAPI_OAUTH2_TOKEN_ISSUER_BACKEND_URL
value: {{ include "camundaPlatform.authIssuerBackendUrl" . | quote }}
- name: RESTAPI_IDENTITY_BASE_URL
value: {{ include "webModeler.identityBaseUrl" . | quote }}
value: {{ include "camundaPlatform.identityURL" . | quote }}
- name: ZEEBE_CLIENT_CONFIG_PATH
value: /tmp/zeebe_client_cache.txt
{{- with .Values.webModeler.restapi.env }}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.3/templates/web-modeler/deployment-webapp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
name: {{ include "webModeler.fullname" . }}
key: pusher-app-key
- name: IDENTITY_BASE_URL
value: {{ include "webModeler.identityBaseUrl" . | quote }}
value: {{ include "camundaPlatform.identityURL" . | quote }}
{{- with .Values.webModeler.webapp.env }}
{{- tpl (toYaml .) $ | nindent 12 }}
{{- end }}
Expand Down
4 changes: 3 additions & 1 deletion charts/camunda-platform-8.4/templates/camunda/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,9 @@ Identity templates.
[camunda-platform] Identity internal URL.
*/}}
{{ define "camundaPlatform.identityURL" }}
{{- if .Values.identity.enabled -}}
{{- if .Values.global.identity.service.url -}}
{{- .Values.global.identity.service.url -}}
{{- else -}}
{{-
printf "http://%s:%v%s"
(include "identity.fullname" .Subcharts.identity)
Expand Down
16 changes: 0 additions & 16 deletions charts/camunda-platform-8.4/templates/web-modeler/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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").
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.4/templates/web-modeler/deployment-restapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
value: "-Xmx1536m"
{{- if .Values.identity.enabled }}
- name: CAMUNDA_IDENTITY_BASEURL
value: {{ include "webModeler.identityBaseUrl" . | quote }}
value: {{ include "camundaPlatform.identityURL" . | quote }}
{{- end }}
- name: CAMUNDA_IDENTITY_TYPE
value: {{ include "camundaPlatform.authType" . | quote }}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.4/templates/web-modeler/deployment-webapp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ spec:
key: pusher-app-key
{{- if .Values.identity.enabled }}
- name: IDENTITY_BASE_URL
value: {{ include "webModeler.identityBaseUrl" . | quote }}
value: {{ include "camundaPlatform.identityURL" . | quote }}
{{- end }}
{{- with .Values.webModeler.webapp.env }}
{{- tpl (toYaml .) $ | nindent 12 }}
Expand Down
4 changes: 3 additions & 1 deletion charts/camunda-platform-8.5/templates/camunda/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,9 @@ Identity templates.
[camunda-platform] Identity internal URL.
*/}}
{{ define "camundaPlatform.identityURL" }}
{{- if .Values.identity.enabled -}}
{{- if .Values.global.identity.service.url -}}
{{- .Values.global.identity.service.url -}}
{{- else -}}
{{-
printf "http://%s:%v%s"
(include "identity.fullname" .)
Expand Down
16 changes: 0 additions & 16 deletions charts/camunda-platform-8.5/templates/web-modeler/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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").
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.5/templates/web-modeler/configmap-restapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ data:
camunda:
identity:
{{- if .Values.identity.enabled }}
base-url: {{ include "webModeler.identityBaseUrl" . | quote }}
base-url: {{ include "camundaPlatform.identityURL" . | quote }}
issuer: {{ include "camundaPlatform.authIssuerUrl" . | quote }}
issuerBackendUrl: {{ include "camundaPlatform.authIssuerBackendUrl" . | quote }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.5/templates/web-modeler/configmap-webapp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ data:
{{- if .Values.identity.enabled }}

[identity]
baseUrl = {{ include "webModeler.identityBaseUrl" . | quote }}
baseUrl = {{ include "camundaPlatform.identityURL" . | quote }}
{{- end }}

{{- end }}
Expand Down
4 changes: 3 additions & 1 deletion charts/camunda-platform-8.6/templates/camunda/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,9 @@ Identity templates.
[camunda-platform] Identity internal URL.
*/}}
{{ define "camundaPlatform.identityURL" }}
{{- if .Values.identity.enabled -}}
{{- if .Values.global.identity.service.url -}}
{{- .Values.global.identity.service.url -}}
{{- else -}}
{{-
printf "http://%s:%v%s"
(include "identity.fullname" .)
Expand Down
16 changes: 0 additions & 16 deletions charts/camunda-platform-8.6/templates/web-modeler/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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").
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.6/templates/web-modeler/configmap-restapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ data:
camunda:
identity:
{{- if .Values.identity.enabled }}
base-url: {{ include "webModeler.identityBaseUrl" . | quote }}
base-url: {{ include "camundaPlatform.identityURL" . | quote }}
issuer: {{ include "camundaPlatform.authIssuerUrl" . | quote }}
issuerBackendUrl: {{ include "camundaPlatform.authIssuerBackendUrl" . | quote }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.6/templates/web-modeler/configmap-webapp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ data:
{{- if .Values.identity.enabled }}

[identity]
baseUrl = {{ include "webModeler.identityBaseUrl" . | quote }}
baseUrl = {{ include "camundaPlatform.identityURL" . | quote }}
{{- end }}

{{- end }}
Expand Down
4 changes: 3 additions & 1 deletion charts/camunda-platform-alpha-8.8/templates/camunda/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,9 @@ Identity templates.
[camunda-platform] Identity internal URL.
*/}}
{{ define "camundaPlatform.identityURL" }}
{{- if .Values.identity.enabled -}}
{{- if .Values.global.identity.service.url -}}
{{- .Values.global.identity.service.url -}}
{{- else -}}
{{-
printf "http://%s:%v%s"
(include "identity.fullname" .)
Expand Down
16 changes: 0 additions & 16 deletions charts/camunda-platform-alpha-8.8/templates/web-modeler/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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").
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-alpha-8.8/templates/web-modeler/configmap-restapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ data:
{{- if .Values.global.identity.auth.enabled }}
identity:
{{- if .Values.identity.enabled }}
base-url: {{ include "webModeler.identityBaseUrl" . | quote }}
base-url: {{ include "camundaPlatform.identityURL" . | quote }}
issuer: {{ include "camundaPlatform.authIssuerUrl" . | quote }}
issuerBackendUrl: {{ include "camundaPlatform.authIssuerBackendUrl" . | quote }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-alpha-8.8/templates/web-modeler/configmap-webapp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ data:
{{- if .Values.identity.enabled }}

[identity]
baseUrl = {{ include "webModeler.identityBaseUrl" . | quote }}
baseUrl = {{ include "camundaPlatform.identityURL" . | quote }}
{{- end }}

{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions charts/camunda-platform-alpha-8.8/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@
"tag": {
"type": "string",
"description": "can be set to overwrite the global tag, which should be used in that chart",
"default": "8.8.0-alpha1"
"default": "8.8.0-alpha2"
},
"pullSecrets": {
"type": "array",
Expand Down Expand Up @@ -5422,7 +5422,7 @@
"tag": {
"type": "string",
"description": "",
"default": "8.17.2"
"default": "8.17.3"
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion charts/camunda-platform-alpha/templates/camunda/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,9 @@ Identity templates.
[camunda-platform] Identity internal URL.
*/}}
{{ define "camundaPlatform.identityURL" }}
{{- if .Values.identity.enabled -}}
{{- if .Values.global.identity.service.url -}}
{{- .Values.global.identity.service.url -}}
{{- else -}}
{{-
printf "http://%s:%v%s"
(include "identity.fullname" .)
Expand Down
16 changes: 0 additions & 16 deletions charts/camunda-platform-alpha/templates/web-modeler/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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").
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-alpha/templates/web-modeler/configmap-restapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ data:
camunda:
identity:
{{- if .Values.identity.enabled }}
base-url: {{ include "webModeler.identityBaseUrl" . | quote }}
base-url: {{ include "camundaPlatform.identityURL" . | quote }}
issuer: {{ include "camundaPlatform.authIssuerUrl" . | quote }}
issuerBackendUrl: {{ include "camundaPlatform.authIssuerBackendUrl" . | quote }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-alpha/templates/web-modeler/configmap-webapp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ data:
{{- if .Values.identity.enabled }}

[identity]
baseUrl = {{ include "webModeler.identityBaseUrl" . | quote }}
baseUrl = {{ include "camundaPlatform.identityURL" . | quote }}
{{- end }}

{{- end }}
Expand Down
Loading