diff options
| author |   BorislavG <Borislav.Glozman@amdocs.com> | 2018-02-27 15:04:26 +0000 |
|---|---|---|
| committer |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-03-01 18:10:31 +0000 |
| commit | 8bfc6cf8c3d338c84c48201f7a4f274958e721a9 (patch) | |
| tree | 2e0e1a969afc6ae38f0a2f62cc1a36e184cb48e1 /kubernetes/consul | |
| parent | f0a34e22011b4323bbd6a51ad313d6e547808101 (diff) | |
Run all components in one namespace
Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/consul')
3 files changed, 7 insertions, 7 deletions
diff --git a/kubernetes/consul/templates/consul-agent-deployment.yaml b/kubernetes/consul/templates/consul-agent-deployment.yaml index aa8e096f6a..81b16b54ca 100644 --- 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 - namespace: "{{ .Values.nsPrefix }}-consul" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -19,7 +19,7 @@ spec: 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 @@ -28,4 +28,4 @@ spec: - hostPath: path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-agent-config name: consul-agent-config -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/consul/templates/consul-server-deployment.yaml b/kubernetes/consul/templates/consul-server-deployment.yaml index a2feb9f6a3..c9f2cfb372 100644 --- a/kubernetes/consul/templates/consul-server-deployment.yaml +++ b/kubernetes/consul/templates/consul-server-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: consul-server name: consul-server - namespace: "{{ .Values.nsPrefix }}-consul" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: 3 selector: @@ -20,7 +20,7 @@ spec: containers: - image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}" 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 @@ -29,4 +29,4 @@ spec: - hostPath: path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-server-config name: consul-server-config -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/consul/templates/consul-server-service.yaml b/kubernetes/consul/templates/consul-server-service.yaml index 3dd801664c..a1e0801eab 100644 --- a/kubernetes/consul/templates/consul-server-service.yaml +++ b/kubernetes/consul/templates/consul-server-service.yaml @@ -5,7 +5,7 @@ metadata: labels: app: consul-server name: consul-server - namespace: "{{ .Values.nsPrefix }}-consul" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: consul-ui |