Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Run all components in one namespace
[oom.git]
/
kubernetes
/
consul
/
templates
/
consul-agent-deployment.yaml
diff --git
a/kubernetes/consul/templates/consul-agent-deployment.yaml
b/kubernetes/consul/templates/consul-agent-deployment.yaml
index
aa8e096
..
81b16b5
100644
(file)
--- a/
kubernetes/consul/templates/consul-agent-deployment.yaml
+++ b/
kubernetes/consul/templates/consul-agent-deployment.yaml
@@
-5,7
+5,7
@@
metadata:
labels:
app: consul-agent
name: consul-agent
labels:
app: consul-agent
name: consul-agent
- namespace: "{{ .Values.nsPrefix }}
-consul
"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
spec:
selector:
matchLabels:
@@
-19,7
+19,7
@@
spec:
containers:
- image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}"
command: ["/usr/local/bin/docker-entrypoint.sh"]
containers:
- image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}"
command: ["/usr/local/bin/docker-entrypoint.sh"]
- args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","consul-server.{{ .Values.nsPrefix }}
-consul
"]
+ args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","consul-server.{{ .Values.nsPrefix }}"]
name: consul-server
volumeMounts:
- mountPath: /consul/config
name: consul-server
volumeMounts:
- mountPath: /consul/config
@@
-28,4
+28,4
@@
spec:
- hostPath:
path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-agent-config
name: consul-agent-config
- hostPath:
path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-agent-config
name: consul-agent-config
-#{{ end }}
\ No newline at end of file
+#{{ end }}