Skip to content

Commit d06cc41

Browse files
bkenezbkenez
authored
fix: refactor restapi pusher secret to new secret convention (#4025)
1 parent 40dd973 commit d06cc41

File tree

4 files changed

+46
-5
lines changed

4 files changed

+46
-5
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,11 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
912912
| `webModeler.restapi.mail.secret.existingSecretKey` | defines the key within the existing secret object. | `""` |
913913
| `webModeler.restapi.mail.fromAddress` | defines the email address that will be displayed as the sender of emails sent by WebModeler | `""` |
914914
| `webModeler.restapi.mail.fromName` | defines the name that will be displayed as the sender of emails sent by WebModeler | `Camunda 8` |
915+
| `webModeler.restapi.pusher` | configuration for Pusher integration | |
916+
| `webModeler.restapi.pusher.secret` | configuration to provide the Pusher app secret | |
917+
| `webModeler.restapi.pusher.secret.inlineSecret` | can be used to provide the Pusher app secret as a plain-text value for non-production usage | `""` |
918+
| `webModeler.restapi.pusher.secret.existingSecret` | can be used to reference an existing Kubernetes Secret containing the Pusher app secret | `""` |
919+
| `webModeler.restapi.pusher.secret.existingSecretKey` | defines the key within the existing secret object | `""` |
915920
| `webModeler.restapi.clusters` | can be used to configure Camunda 8 clusters that will be available in Web Modeler (will override default cluster configuration that is used if `orchestration.enabled=true`) | `[]` |
916921
| `webModeler.restapi.podAnnotations` | can be used to define extra restapi pod annotations | `{}` |
917922
| `webModeler.restapi.podLabels` | can be used to define extra restapi pod labels | `{}` |

‎charts/camunda-platform-8.8/templates/web-modeler/deployment-restapi.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,12 @@ spec:
7070
configMapKeyRef:
7171
name: {{ include "webModeler.fullname" . }}-configuration
7272
key: pusher-app-key
73-
- name: RESTAPI_PUSHER_SECRET
74-
valueFrom:
75-
secretKeyRef:
76-
name: {{ include "webModeler.fullname" . }}
77-
key: pusher-app-secret
73+
{{- include "camundaPlatform.emitEnvVarFromSecretConfig" (dict
74+
"envName" "RESTAPI_PUSHER_SECRET"
75+
"config" .Values.webModeler.restapi.pusher
76+
"defaultSecretName" (include "webModeler.fullname" .)
77+
"defaultSecretKey" "pusher-app-secret"
78+
) | nindent 12 }}
7879
- name: ZEEBE_CLIENT_CONFIG_PATH
7980
value: /tmp/zeebe_client_cache.txt
8081
{{- if .Values.global.documentStore.type.aws.enabled }}

‎charts/camunda-platform-8.8/values.schema.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2907,6 +2907,31 @@
29072907
}
29082908
}
29092909
},
2910+
"pusher": {
2911+
"type": "object",
2912+
"properties": {
2913+
"secret": {
2914+
"type": "object",
2915+
"properties": {
2916+
"inlineSecret": {
2917+
"type": "string",
2918+
"description": "can be used to provide the Pusher app secret as a plain-text value for non-production usage",
2919+
"default": ""
2920+
},
2921+
"existingSecret": {
2922+
"type": "string",
2923+
"description": "can be used to reference an existing Kubernetes Secret containing the Pusher app secret",
2924+
"default": ""
2925+
},
2926+
"existingSecretKey": {
2927+
"type": "string",
2928+
"description": "defines the key within the existing secret object",
2929+
"default": ""
2930+
}
2931+
}
2932+
}
2933+
}
2934+
},
29102935
"clusters": {
29112936
"type": "array",
29122937
"description": "can be used to configure Camunda 8 clusters that will be available in Web Modeler (will override default cluster configuration that is used if `orchestration.enabled=true`)",

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,6 +1483,16 @@ webModeler:
14831483
fromAddress: ""
14841484
## @param webModeler.restapi.mail.fromName defines the name that will be displayed as the sender of emails sent by WebModeler
14851485
fromName: "Camunda 8"
1486+
## @extra webModeler.restapi.pusher configuration for Pusher integration
1487+
pusher:
1488+
## @extra webModeler.restapi.pusher.secret configuration to provide the Pusher app secret
1489+
secret:
1490+
## @param webModeler.restapi.pusher.secret.inlineSecret can be used to provide the Pusher app secret as a plain-text value for non-production usage
1491+
inlineSecret: ""
1492+
## @param webModeler.restapi.pusher.secret.existingSecret can be used to reference an existing Kubernetes Secret containing the Pusher app secret
1493+
existingSecret: ""
1494+
## @param webModeler.restapi.pusher.secret.existingSecretKey defines the key within the existing secret object
1495+
existingSecretKey: ""
14861496

14871497
## @param webModeler.restapi.clusters can be used to configure Camunda 8 clusters that will be available in Web Modeler (will override default cluster configuration that is used if `orchestration.enabled=true`)
14881498
clusters: []

0 commit comments

Comments
 (0)