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 "[CPS] Service Mesh Compliance for CPS"
[oom.git]
/
kubernetes
/
cli
/
templates
/
deployment.yaml
diff --git
a/kubernetes/cli/templates/deployment.yaml
b/kubernetes/cli/templates/deployment.yaml
index
0823daf
..
0a3f967
100644
(file)
--- a/
kubernetes/cli/templates/deployment.yaml
+++ b/
kubernetes/cli/templates/deployment.yaml
@@
-35,9
+35,10
@@
spec:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
spec:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
spec:
+ initContainers: {{ include "common.certInitializer.initContainer" . | nindent 6 }}
containers:
- name: {{ include "common.name" . }}
containers:
- name: {{ include "common.name" . }}
- image:
"{{ include "common.repository" . }}/{{ .Values.image }}"
+ image:
{{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
@@
-56,10
+57,10
@@
spec:
port: {{ .Values.service.internalPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
port: {{ .Values.service.internalPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
- volumeMounts:
- - name:
ocomp-pem
- mountPath: "/etc/lighttpd/
ocomp.pem
"
- subPath:
ocomp.pem
+ volumeMounts:
{{- include "common.certInitializer.volumeMount" . | nindent 10 }}
+ - name:
lighttpd
+ mountPath: "/etc/lighttpd/
lighttpd.conf
"
+ subPath:
lighttpd.conf
readOnly: true
env:
- name: OPEN_CLI_MODE
readOnly: true
env:
- name: OPEN_CLI_MODE
@@
-74,9
+75,10
@@
spec:
affinity:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
affinity:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- volumes:
- - name: ocomp-pem
- secret:
- secretName: ocomp-pem
+ serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
+ volumes: {{ include "common.certInitializer.volumes" . | nindent 6 }}
+ - name: lighttpd
+ configMap:
+ name: {{ include "common.fullname" . }}-lighttpd
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"