Skip to content

Commit 7b78522

Browse files
author
DJ
committed
added support for config.yaml
1 parent 670bfcf commit 7b78522

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

helm/flink-kubernetes-operator/templates/flink-operator.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ spec:
207207
valueFrom:
208208
fieldRef:
209209
fieldPath: metadata.namespace
210+
{{- with .Values.operatorPod.webhook.container.env }}
211+
{{- toYaml . | nindent 12 }}
212+
{{- end }}
210213
resources:
211214
{{- toYaml .Values.operatorPod.webhook.resources | nindent 12 }}
212215
securityContext:
@@ -232,8 +235,13 @@ spec:
232235
configMap:
233236
name: flink-operator-config
234237
items:
238+
{{- if index .Values.defaultConfiguration "config.yaml" }}
239+
- key: config.yaml
240+
path: config.yaml
241+
{{- else }}
235242
- key: flink-conf.yaml
236243
path: flink-conf.yaml
244+
{{- end }}
237245
- key: log4j-operator.properties
238246
path: log4j-operator.properties
239247
- key: log4j-console.properties
@@ -268,13 +276,20 @@ metadata:
268276
labels:
269277
{{- include "flink-operator.labels" . | nindent 4 }}
270278
data:
279+
{{- if index .Values.defaultConfiguration "config.yaml" }}
280+
config.yaml: |+
281+
{{- else }}
271282
flink-conf.yaml: |+
283+
{{- end }}
272284
{{- if .Values.defaultConfiguration.append }}
273285
{{- $.Files.Get "conf/flink-conf.yaml" | nindent 4 -}}
274286
{{- end }}
275287
{{- if index (.Values.defaultConfiguration) "flink-conf.yaml" }}
276288
{{- index (.Values.defaultConfiguration) "flink-conf.yaml" | nindent 4 -}}
277289
{{- end }}
290+
{{- if index (.Values.defaultConfiguration) "config.yaml" }}
291+
{{- index (.Values.defaultConfiguration) "config.yaml" | nindent 4 -}}
292+
{{- end }}
278293
{{- if .Values.watchNamespaces }}
279294
kubernetes.operator.watched.namespaces: {{ join "," .Values.watchNamespaces }}
280295
{{- end }}

0 commit comments

Comments
 (0)