Skip to content

Commit 8b20ed8

Browse files
aabouzaidaabouzaid
authored
fix: operate opensearch access in the unified config (#4224)
1 parent b03513d commit 8b20ed8

File tree

4 files changed

+47
-27
lines changed

4 files changed

+47
-27
lines changed

‎charts/camunda-platform-8.8/templates/orchestration/files/_application-unified.yaml‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ camunda:
4545
address: 0.0.0.0
4646
port: {{ .Values.orchestration.service.grpcPort }}
4747

48+
{{- if .Values.global.opensearch.enabled }}
49+
# Database configuration - Separated syntax.
50+
database:
51+
awsEnabled: {{ .Values.global.opensearch.aws.enabled }}
52+
{{- end }}
53+
4854
data:
4955
snapshot-period: {{ .Values.orchestration.data.snapshotPeriod | quote }}
5056
primary-storage:
@@ -73,9 +79,9 @@ camunda:
7379
index-prefix: {{ .Values.global.opensearch.prefix | quote }}
7480
history:
7581
policy-name: {{ .Values.orchestration.history.retention.policyName | quote }}
76-
{{- end }}
82+
{{- end }}
7783

78-
# Security configuration - Seperated syntax.
84+
# Security configuration - Separated syntax.
7985
security:
8086
authentication:
8187
{{- if eq .Values.orchestration.security.authentication.method "oidc" }}
@@ -138,7 +144,7 @@ camunda:
138144
{{- if .Values.orchestration.profiles.operate -}}
139145
{{- "\n" }}
140146
#
141-
# Camunda Operate Configuration - Seperated syntax.
147+
# Camunda Operate Configuration - Separated syntax.
142148
#
143149
operate:
144150
persistentSessionsEnabled: {{ include "orchestration.persistentSessionsEnabled" . }}
@@ -148,7 +154,15 @@ camunda:
148154
identity:
149155
redirectRootUrl: "{{ tpl .Values.global.identity.auth.orchestration.redirectUrl $ }}/operate"
150156
{{- end }}
151-
157+
{{- if .Values.global.opensearch.enabled }}
158+
# OpenSearch
159+
opensearch:
160+
awsEnabled: {{ .Values.global.opensearch.aws.enabled }}
161+
zeebeOpensearch:
162+
awsEnabled: {{ .Values.global.opensearch.aws.enabled }}
163+
username: {{ .Values.global.opensearch.auth.username | quote }}
164+
password: "${VALUES_OPENSEARCH_PASSWORD:}"
165+
{{- end }}
152166
# Zeebe instance
153167
zeebe:
154168
# Gateway address
@@ -163,7 +177,7 @@ camunda:
163177
{{- if .Values.orchestration.profiles.tasklist -}}
164178
{{- "\n" }}
165179
#
166-
# Camunda Tasklist Configuration - Seperated syntax.
180+
# Camunda Tasklist Configuration - Separated syntax.
167181
#
168182
tasklist:
169183
multiTenancy:
@@ -173,7 +187,15 @@ camunda:
173187
identity:
174188
redirectRootUrl: "{{ tpl .Values.global.identity.auth.orchestration.redirectUrl $ }}/tasklist"
175189
{{- end }}
176-
190+
{{- if .Values.global.opensearch.enabled }}
191+
# OpenSearch
192+
opensearch:
193+
awsEnabled: {{ .Values.global.opensearch.aws.enabled }}
194+
zeebeOpensearch:
195+
awsEnabled: {{ .Values.global.opensearch.aws.enabled }}
196+
username: {{ .Values.global.opensearch.auth.username | quote }}
197+
password: "${VALUES_OPENSEARCH_PASSWORD:}"
198+
{{- end }}
177199
# Zeebe instance
178200
zeebe:
179201
# Gateway address
@@ -189,7 +211,7 @@ camunda:
189211
{{- if .Values.orchestration.profiles.broker -}}
190212
{{- "\n" }}
191213
#
192-
# Camunda Zeebe Configuration - Seperated syntax.
214+
# Camunda Zeebe Configuration - Separated syntax.
193215
#
194216
zeebe:
195217
host: 0.0.0.0
@@ -280,12 +302,13 @@ zeebe:
280302
username: {{ if .Values.global.elasticsearch.auth.username }}{{ .Values.global.elasticsearch.auth.username | quote }}{{ else }}{{ .Values.global.opensearch.auth.username | quote }}{{- end }}
281303
password: "{{ if .Values.global.elasticsearch.auth.username }}${VALUES_ELASTICSEARCH_PASSWORD:}{{ else }}${VALUES_OPENSEARCH_PASSWORD:}{{- end }}"
282304
{{- end }}
283-
{{- if .Values.orchestration.retention.enabled }}
305+
awsEnabled: {{ .Values.global.opensearch.aws.enabled }}
306+
{{- if .Values.orchestration.retention.enabled }}
284307
retention:
285308
enabled: true
286309
minimumAge: {{ .Values.orchestration.retention.minimumAge | quote }}
287310
policyName: {{ .Values.orchestration.retention.policyName | quote }}
288-
{{- end }}
311+
{{- end }}
289312
history:
290313
elsRolloverDateFormat: {{ .Values.orchestration.history.elsRolloverDateFormat | quote }}
291314
rolloverInterval: {{ .Values.orchestration.history.rolloverInterval | quote }}

‎charts/camunda-platform-8.8/test/unit/orchestration/golden/configmap-authorizations.golden.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ data:
8484
history:
8585
policy-name: "camunda-history-retention-policy"
8686
87-
# Security configuration - Seperated syntax.
87+
# Security configuration - Separated syntax.
8888
security:
8989
authentication:
9090
method: "basic"
@@ -113,33 +113,31 @@ data:
113113
apiEnabled: true
114114
115115
#
116-
# Camunda Operate Configuration - Seperated syntax.
116+
# Camunda Operate Configuration - Separated syntax.
117117
#
118118
operate:
119119
persistentSessionsEnabled: true
120120
multiTenancy:
121121
enabled: false
122-
123122
# Zeebe instance
124123
zeebe:
125124
# Gateway address
126125
gatewayAddress: "camunda-platform-test-zeebe-gateway:26500"
127126
128127
#
129-
# Camunda Tasklist Configuration - Seperated syntax.
128+
# Camunda Tasklist Configuration - Separated syntax.
130129
#
131130
tasklist:
132131
multiTenancy:
133132
enabled: false
134-
135133
# Zeebe instance
136134
zeebe:
137135
# Gateway address
138136
gatewayAddress: "camunda-platform-test-zeebe-gateway:26500"
139137
restAddress: "http://camunda-platform-test-zeebe:8080/orchestration"
140138
141139
#
142-
# Camunda Zeebe Configuration - Seperated syntax.
140+
# Camunda Zeebe Configuration - Separated syntax.
143141
#
144142
zeebe:
145143
host: 0.0.0.0
@@ -179,6 +177,7 @@ data:
179177
type: "elasticsearch"
180178
url: "http://camunda-platform-test-elasticsearch:9200"
181179
numberOfReplicas: "1"
180+
awsEnabled: false
182181
history:
183182
elsRolloverDateFormat: "date"
184183
rolloverInterval: "1d"

‎charts/camunda-platform-8.8/test/unit/orchestration/golden/configmap-log4j2.golden.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ data:
8484
history:
8585
policy-name: "camunda-history-retention-policy"
8686
87-
# Security configuration - Seperated syntax.
87+
# Security configuration - Separated syntax.
8888
security:
8989
authentication:
9090
method: "basic"
@@ -113,33 +113,31 @@ data:
113113
apiEnabled: true
114114
115115
#
116-
# Camunda Operate Configuration - Seperated syntax.
116+
# Camunda Operate Configuration - Separated syntax.
117117
#
118118
operate:
119119
persistentSessionsEnabled: true
120120
multiTenancy:
121121
enabled: false
122-
123122
# Zeebe instance
124123
zeebe:
125124
# Gateway address
126125
gatewayAddress: "camunda-platform-test-zeebe-gateway:26500"
127126
128127
#
129-
# Camunda Tasklist Configuration - Seperated syntax.
128+
# Camunda Tasklist Configuration - Separated syntax.
130129
#
131130
tasklist:
132131
multiTenancy:
133132
enabled: false
134-
135133
# Zeebe instance
136134
zeebe:
137135
# Gateway address
138136
gatewayAddress: "camunda-platform-test-zeebe-gateway:26500"
139137
restAddress: "http://camunda-platform-test-zeebe:8080/orchestration"
140138
141139
#
142-
# Camunda Zeebe Configuration - Seperated syntax.
140+
# Camunda Zeebe Configuration - Separated syntax.
143141
#
144142
zeebe:
145143
host: 0.0.0.0
@@ -179,6 +177,7 @@ data:
179177
type: "elasticsearch"
180178
url: "http://camunda-platform-test-elasticsearch:9200"
181179
numberOfReplicas: "1"
180+
awsEnabled: false
182181
history:
183182
elsRolloverDateFormat: "date"
184183
rolloverInterval: "1d"

‎charts/camunda-platform-8.8/test/unit/orchestration/golden/configmap-unified.golden.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ data:
8484
history:
8585
policy-name: "camunda-history-retention-policy"
8686
87-
# Security configuration - Seperated syntax.
87+
# Security configuration - Separated syntax.
8888
security:
8989
authentication:
9090
method: "basic"
@@ -113,33 +113,31 @@ data:
113113
apiEnabled: true
114114
115115
#
116-
# Camunda Operate Configuration - Seperated syntax.
116+
# Camunda Operate Configuration - Separated syntax.
117117
#
118118
operate:
119119
persistentSessionsEnabled: true
120120
multiTenancy:
121121
enabled: false
122-
123122
# Zeebe instance
124123
zeebe:
125124
# Gateway address
126125
gatewayAddress: "camunda-platform-test-zeebe-gateway:26500"
127126
128127
#
129-
# Camunda Tasklist Configuration - Seperated syntax.
128+
# Camunda Tasklist Configuration - Separated syntax.
130129
#
131130
tasklist:
132131
multiTenancy:
133132
enabled: false
134-
135133
# Zeebe instance
136134
zeebe:
137135
# Gateway address
138136
gatewayAddress: "camunda-platform-test-zeebe-gateway:26500"
139137
restAddress: "http://camunda-platform-test-zeebe:8080/orchestration"
140138
141139
#
142-
# Camunda Zeebe Configuration - Seperated syntax.
140+
# Camunda Zeebe Configuration - Separated syntax.
143141
#
144142
zeebe:
145143
host: 0.0.0.0
@@ -179,6 +177,7 @@ data:
179177
type: "elasticsearch"
180178
url: "http://camunda-platform-test-elasticsearch:9200"
181179
numberOfReplicas: "1"
180+
awsEnabled: false
182181
history:
183182
elsRolloverDateFormat: "date"
184183
rolloverInterval: "1d"

0 commit comments

Comments
 (0)