Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[MULTICLOUD] Move multicloud k8s to use strimzi kafka user template"
[oom.git]
/
kubernetes
/
multicloud
/
components
/
multicloud-k8s
/
templates
/
deployment.yaml
diff --git
a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
index
9f50d35
..
ed6b64c
100644
(file)
--- a/
kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
+++ b/
kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
@@
-62,8
+62,7
@@
spec:
- mountPath: /opt/multicloud/k8splugin/k8sconfig.json
name: {{ include "common.name" .}}
subPath: k8sconfig.json
- mountPath: /opt/multicloud/k8splugin/k8sconfig.json
name: {{ include "common.name" .}}
subPath: k8sconfig.json
- resources:
-{{ include "common.resources" . | indent 10 }}
+ resources: {{ include "common.resources" . | nindent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
@@
-73,6
+72,7
@@
spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: framework-artifactbroker
command: ["/opt/app/distribution/bin/artifact-dist.sh"]
args: ["/opt/app/distribution/etc/mounted/config.json"]
name: framework-artifactbroker
command: ["/opt/app/distribution/bin/artifact-dist.sh"]
args: ["/opt/app/distribution/etc/mounted/config.json"]
@@
-85,7
+85,13
@@
spec:
subPath: config.json
- mountPath: /data
name: artifact-data
subPath: config.json
- mountPath: /data
name: artifact-data
-
+ env:
+ - name: SASL_JAAS_CONFIG
+ valueFrom:
+ secretKeyRef:
+ name: {{ include "common.name" . }}-ku
+ key: sasl.jaas.config
+ serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: localtime
hostPath:
volumes:
- name: localtime
hostPath: