Skip to content

Commit e6d2cb6

Browse files
aabouzaidaabouzaid
authored
refactor: move identity remaining env vars to config (#2400)
Signed-off-by: Ahmed AbouZaid <[email protected]>
1 parent 36daf1e commit e6d2cb6

File tree

14 files changed

+162
-156
lines changed

14 files changed

+162
-156
lines changed

‎charts/camunda-platform-8.5/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
492492
| `global.identity.auth.connectors.existingSecret` | can be used to use an own existing secret. If not set a random secret is generated. | `nil` |
493493
| `global.identity.auth.connectors.existingSecretKey` | defines the key within the existing secret object. | `connectors-secret` |
494494
| `global.identity.auth.identity` | configuration to configure Identity authentication specifics on global level, which can be accessed by other sub-charts | |
495-
| `global.identity.auth.identity.clientId` | defines the client id, which is used by Identity in authentication flows. | `identity` |
495+
| `global.identity.auth.identity.clientId` | defines the client id, which is used by Identity in authentication flows. | `camunda-identity` |
496496
| `global.identity.auth.identity.audience` | defines the audience, which is used by Identity. | `camunda-identity-resource-server` |
497497
| `global.identity.auth.identity.existingSecret` | can be used to reference an existing secret. This should ONLY be used for an external OIDC provider. If not set, a random secret is generated. | `nil` |
498498
| `global.identity.auth.identity.existingSecretKey` | defines the key within the existing secret object. | `identity-secret` |

‎charts/camunda-platform-8.5/templates/identity/configmap.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,7 @@ data:
205205
environment:
206206
clients:
207207
- name: Identity
208-
{{- if (tpl ( include "identity.authClientSecret" . ) .)}}
209208
id: {{ printf "%s" (include "identity.authClientId" .) | default "camunda-identity" | quote }}
210-
{{- else }}
211-
id: "camunda-identity"
212-
{{- end }}
213209
type: CONFIDENTIAL
214210
secret: ${IDENTITY_CLIENT_SECRET:}
215211
root-url: {{ include "identity.externalUrl" . | quote }}

‎charts/camunda-platform-8.5/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ global:
252252
## @extra global.identity.auth.identity configuration to configure Identity authentication specifics on global level, which can be accessed by other sub-charts
253253
identity:
254254
## @param global.identity.auth.identity.clientId defines the client id, which is used by Identity in authentication flows.
255-
clientId: identity
255+
clientId: camunda-identity
256256
## @param global.identity.auth.identity.audience defines the audience, which is used by Identity.
257257
audience: camunda-identity-resource-server
258258
## @param global.identity.auth.identity.existingSecret can be used to reference an existing secret. This should ONLY be used for an external OIDC provider. If not set, a random secret is generated.

‎charts/camunda-platform-8.6/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
507507
| `global.identity.auth.connectors.existingSecret` | can be used to use an own existing secret. If not set a random secret is generated. | `nil` |
508508
| `global.identity.auth.connectors.existingSecretKey` | defines the key within the existing secret object. | `connectors-secret` |
509509
| `global.identity.auth.identity` | configuration to configure Identity authentication specifics on global level, which can be accessed by other sub-charts | |
510-
| `global.identity.auth.identity.clientId` | defines the client id, which is used by Identity in authentication flows. | `identity` |
510+
| `global.identity.auth.identity.clientId` | defines the client id, which is used by Identity in authentication flows. | `camunda-identity` |
511511
| `global.identity.auth.identity.audience` | defines the audience, which is used by Identity. | `camunda-identity-resource-server` |
512512
| `global.identity.auth.identity.existingSecret` | can be used to reference an existing secret. This should ONLY be used for an external OIDC provider. If not set, a random secret is generated. | `nil` |
513513
| `global.identity.auth.identity.existingSecretKey` | defines the key within the existing secret object. | `identity-secret` |

‎charts/camunda-platform-8.6/templates/identity/configmap.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,9 @@ data:
216216
environment:
217217
clients:
218218
- name: Identity
219-
{{- if (tpl ( include "identity.authClientSecret" . ) .)}}
220219
id: {{ printf "%s" (include "identity.authClientId" .) | default "camunda-identity" | quote }}
221-
{{- else }}
222-
id: "camunda-identity"
223-
{{- end }}
224220
type: CONFIDENTIAL
225-
secret: ${IDENTITY_CLIENT_SECRET:}
221+
secret: ${CAMUNDA_IDENTITY_CLIENT_SECRET:}
226222
root-url: {{ include "identity.externalUrl" . | quote }}
227223
redirect-uris:
228224
- "/auth/login-callback"

‎charts/camunda-platform-8.6/test/unit/identity/golden/configmap.golden.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ data:
208208
- name: Identity
209209
id: "camunda-identity"
210210
type: CONFIDENTIAL
211-
secret: ${IDENTITY_CLIENT_SECRET:}
211+
secret: ${CAMUNDA_IDENTITY_CLIENT_SECRET:}
212212
root-url: "http://localhost:8080"
213213
redirect-uris:
214214
- "/auth/login-callback"

‎charts/camunda-platform-8.6/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ global:
260260
## @extra global.identity.auth.identity configuration to configure Identity authentication specifics on global level, which can be accessed by other sub-charts
261261
identity:
262262
## @param global.identity.auth.identity.clientId defines the client id, which is used by Identity in authentication flows.
263-
clientId: identity
263+
clientId: camunda-identity
264264
## @param global.identity.auth.identity.audience defines the audience, which is used by Identity.
265265
audience: camunda-identity-resource-server
266266
## @param global.identity.auth.identity.existingSecret can be used to reference an existing secret. This should ONLY be used for an external OIDC provider. If not set, a random secret is generated.

‎charts/camunda-platform-alpha/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
483483
| `global.identity.auth.connectors.existingSecret` | can be used to use an own existing secret. If not set a random secret is generated. | `nil` |
484484
| `global.identity.auth.connectors.existingSecretKey` | defines the key within the existing secret object. | `connectors-secret` |
485485
| `global.identity.auth.identity` | configuration to configure Identity authentication specifics on global level, which can be accessed by other sub-charts | |
486-
| `global.identity.auth.identity.clientId` | defines the client id, which is used by Identity in authentication flows. | `identity` |
486+
| `global.identity.auth.identity.clientId` | defines the client id, which is used by Identity in authentication flows. | `camunda-identity` |
487487
| `global.identity.auth.identity.audience` | defines the audience, which is used by Identity. | `camunda-identity-resource-server` |
488488
| `global.identity.auth.identity.existingSecret` | can be used to reference an existing secret. This should ONLY be used for an external OIDC provider. If not set, a random secret is generated. | `nil` |
489489
| `global.identity.auth.identity.existingSecretKey` | defines the key within the existing secret object. | `identity-secret` |

0 commit comments

Comments
 (0)