Merge "Add INFO.yaml file"

[oom.git] / kubernetes / consul / templates / consul-server-deployment.yaml

diff --git a/kubernetes/consul/templates/consul-server-deployment.yaml b/kubernetes/consul/templates/consul-server-deployment.yaml
index e914b6b..706aa0e 100644 (file)
--- a/kubernetes/consul/templates/consul-server-deployment.yaml
+++ b/kubernetes/consul/templates/consul-server-deployment.yaml
@@ -1,12 +1,13 @@
+#{{ if not .Values.disableConsulConsulServer }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   labels:
     app: consul-server
   name: consul-server
-  namespace: "{{ .Values.nsPrefix }}-consul"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
-  replicas: 3
+  replicas: {{ .Values.consulServerReplicas }}
   selector:
     matchLabels:
       app: consul-server
@@ -17,14 +18,8 @@ spec:
       name: consul-server
     spec:
       containers:
-      - image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}"
+      - image: "{{ .Values.consulserverRegistry }}"
         command: ["/usr/local/bin/docker-entrypoint.sh"]
-        args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect=3","-ui","-join","consul-server.{{ .Values.nsPrefix }}-consul"]
+        args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect=3","-ui","-join","consul-server.{{ .Values.nsPrefix }}"]
         name: consul-server
-        volumeMounts:
-        - mountPath: /consul/config
-          name: consul-server-config
-      volumes:
-      - hostPath:
-          path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-server-config
-        name: consul-server-config
+#{{ end }}