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 "[DMAAP] DMaaP ServiceMesh compatibility"
[oom.git]
/
kubernetes
/
consul
/
templates
/
deployment.yaml
diff --git
a/kubernetes/consul/templates/deployment.yaml
b/kubernetes/consul/templates/deployment.yaml
index
6f1c579
..
c5d12a4
100644
(file)
--- a/
kubernetes/consul/templates/deployment.yaml
+++ b/
kubernetes/consul/templates/deployment.yaml
@@
-56,11
+56,13
@@
spec:
- mountPath: /consul/config
name: consul-agent-config-dir
containers:
- mountPath: /consul/config
name: consul-agent-config-dir
containers:
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
+ securityContext:
+ runAsUser: {{ .Values.securityContext.runAsUser }}
+ runAsGroup: {{ .Values.securityContext.runAsGroup }}
command:
command:
- - sh
+ -
docker-entrypoint.
sh
args:
args:
- - /usr/local/bin/docker-entrypoint.sh
- agent
- -client
- 0.0.0.0
- agent
- -client
- 0.0.0.0
@@
-81,6
+83,7
@@
spec:
- mountPath: /consul/certs
name: consul-agent-certs-config
resources: {{ include "common.resources" . | nindent 10 }}
- mountPath: /consul/certs
name: consul-agent-certs-config
resources: {{ include "common.resources" . | nindent 10 }}
+ serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: consul-agent-config-dir
emptyDir: {}
volumes:
- name: consul-agent-config-dir
emptyDir: {}