From 890d2028e14ed79c9a0f14b1ac7845379a3eb301 Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Thu, 27 Jun 2024 17:06:21 +0200 Subject: [PATCH] fix: identity base url not configured (#2028) --- charts/camunda-platform-latest/templates/operate/configmap.yaml | 1 + .../camunda-platform-latest/templates/optimize/configmap.yaml | 2 ++ .../camunda-platform-latest/templates/tasklist/configmap.yaml | 2 ++ .../templates/zeebe-gateway/configmap.yaml | 2 -- .../test/unit/operate/golden/configmap.golden.yaml | 1 + .../test/unit/tasklist/golden/configmap.golden.yaml | 1 + .../test/unit/zeebe-gateway/golden/configmap-log4j2.golden.yaml | 1 + .../test/unit/zeebe-gateway/golden/configmap.golden.yaml | 1 + 8 files changed, 9 insertions(+), 2 deletions(-) diff --git a/charts/camunda-platform-latest/templates/operate/configmap.yaml b/charts/camunda-platform-latest/templates/operate/configmap.yaml index a7a9a0c234..b759ff9087 100644 --- a/charts/camunda-platform-latest/templates/operate/configmap.yaml +++ b/charts/camunda-platform-latest/templates/operate/configmap.yaml @@ -31,6 +31,7 @@ data: identity: clientId: {{ include "operate.authClientId" . | quote }} audience: {{ include "operate.authAudience" . | quote }} + baseUrl: {{ include "camundaPlatform.identityURL" . | quote }} {{- else }} spring: profiles: diff --git a/charts/camunda-platform-latest/templates/optimize/configmap.yaml b/charts/camunda-platform-latest/templates/optimize/configmap.yaml index 55c5a60e47..e73dc9548d 100644 --- a/charts/camunda-platform-latest/templates/optimize/configmap.yaml +++ b/charts/camunda-platform-latest/templates/optimize/configmap.yaml @@ -63,6 +63,8 @@ data: audience: {{ include "optimize.authAudience" . | quote }} issuer: {{ include "camundaPlatform.authIssuerUrl" . | quote }} issuerBackendUrl: {{ include "camundaPlatform.authIssuerBackendUrl" . | quote }} + baseUrl: {{ include "camundaPlatform.identityURL" . | quote }} + {{- end }} {{- range $key, $val := .Values.optimize.extraConfiguration }} diff --git a/charts/camunda-platform-latest/templates/tasklist/configmap.yaml b/charts/camunda-platform-latest/templates/tasklist/configmap.yaml index 4e6d84f384..0e8d8310ba 100644 --- a/charts/camunda-platform-latest/templates/tasklist/configmap.yaml +++ b/charts/camunda-platform-latest/templates/tasklist/configmap.yaml @@ -32,6 +32,8 @@ data: identity: clientId: {{ include "tasklist.authClientId" . | quote }} audience: {{ include "tasklist.authAudience" . | quote }} + baseUrl: {{ include "camundaPlatform.identityURL" . | quote }} + {{- else }} spring: profiles: diff --git a/charts/camunda-platform-latest/templates/zeebe-gateway/configmap.yaml b/charts/camunda-platform-latest/templates/zeebe-gateway/configmap.yaml index f8d4230c65..a4b6c0b337 100644 --- a/charts/camunda-platform-latest/templates/zeebe-gateway/configmap.yaml +++ b/charts/camunda-platform-latest/templates/zeebe-gateway/configmap.yaml @@ -43,8 +43,6 @@ data: type: {{ include "camundaPlatform.authType" . | quote }} issuerBackendUrl: {{ include "camundaPlatform.authIssuerBackendUrl" . | quote }} audience: {{ include "zeebe.audience" . | quote }} - {{- end }} - {{- if .Values.global.multitenancy.enabled }} baseUrl: {{ include "camundaPlatform.identityURL" . | quote }} {{- end }} {{- end }} diff --git a/charts/camunda-platform-latest/test/unit/operate/golden/configmap.golden.yaml b/charts/camunda-platform-latest/test/unit/operate/golden/configmap.golden.yaml index 4f102bf696..7116828ca9 100644 --- a/charts/camunda-platform-latest/test/unit/operate/golden/configmap.golden.yaml +++ b/charts/camunda-platform-latest/test/unit/operate/golden/configmap.golden.yaml @@ -28,6 +28,7 @@ data: identity: clientId: "operate" audience: "operate-api" + baseUrl: "http://camunda-platform-test-identity:80" # Operate configuration file camunda.operate: diff --git a/charts/camunda-platform-latest/test/unit/tasklist/golden/configmap.golden.yaml b/charts/camunda-platform-latest/test/unit/tasklist/golden/configmap.golden.yaml index f9737a8388..7149a927cb 100644 --- a/charts/camunda-platform-latest/test/unit/tasklist/golden/configmap.golden.yaml +++ b/charts/camunda-platform-latest/test/unit/tasklist/golden/configmap.golden.yaml @@ -28,6 +28,7 @@ data: identity: clientId: "tasklist" audience: "tasklist-api" + baseUrl: "http://camunda-platform-test-identity:80" # Tasklist configuration file camunda.tasklist: diff --git a/charts/camunda-platform-latest/test/unit/zeebe-gateway/golden/configmap-log4j2.golden.yaml b/charts/camunda-platform-latest/test/unit/zeebe-gateway/golden/configmap-log4j2.golden.yaml index 30699a57ee..20e91ea327 100644 --- a/charts/camunda-platform-latest/test/unit/zeebe-gateway/golden/configmap-log4j2.golden.yaml +++ b/charts/camunda-platform-latest/test/unit/zeebe-gateway/golden/configmap-log4j2.golden.yaml @@ -31,6 +31,7 @@ data: type: "KEYCLOAK" issuerBackendUrl: "http://camunda-platform-test-keycloak:80/auth/realms/camunda-platform" audience: "zeebe-api" + baseUrl: "http://camunda-platform-test-identity:80" zeebe: gateway: security: diff --git a/charts/camunda-platform-latest/test/unit/zeebe-gateway/golden/configmap.golden.yaml b/charts/camunda-platform-latest/test/unit/zeebe-gateway/golden/configmap.golden.yaml index 432b846b99..c9c62cf676 100644 --- a/charts/camunda-platform-latest/test/unit/zeebe-gateway/golden/configmap.golden.yaml +++ b/charts/camunda-platform-latest/test/unit/zeebe-gateway/golden/configmap.golden.yaml @@ -29,6 +29,7 @@ data: type: "KEYCLOAK" issuerBackendUrl: "http://camunda-platform-test-keycloak:80/auth/realms/camunda-platform" audience: "zeebe-api" + baseUrl: "http://camunda-platform-test-identity:80" zeebe: gateway: security: