aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/msb/templates
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-02-27 15:04:26 +0000
committerAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-03-01 18:10:31 +0000
commit8bfc6cf8c3d338c84c48201f7a4f274958e721a9 (patch)
tree2e0e1a969afc6ae38f0a2f62cc1a36e184cb48e1 /kubernetes/msb/templates
parentf0a34e22011b4323bbd6a51ad313d6e547808101 (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/msb/templates')
-rw-r--r--kubernetes/msb/templates/all-services.yaml8
-rw-r--r--kubernetes/msb/templates/msb-consul-deployment.yaml2
-rw-r--r--kubernetes/msb/templates/msb-discovery-deployment.yaml4
-rw-r--r--kubernetes/msb/templates/msb-eag-deployment.yaml6
-rw-r--r--kubernetes/msb/templates/msb-iag-deployment.yaml6
5 files changed, 13 insertions, 13 deletions
diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml
index 8c6db30420..0ae94fc1bc 100644
--- a/kubernetes/msb/templates/all-services.yaml
+++ b/kubernetes/msb/templates/all-services.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: msb-consul
- namespace: "{{ .Values.nsPrefix }}-msb"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: msb-consul
spec:
@@ -20,7 +20,7 @@ apiVersion: v1
kind: Service
metadata:
name: msb-discovery
- namespace: "{{ .Values.nsPrefix }}-msb"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: msb-discovery
spec:
@@ -38,7 +38,7 @@ apiVersion: v1
kind: Service
metadata:
name: msb-iag
- namespace: "{{ .Values.nsPrefix }}-msb"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: msb-iag
spec:
@@ -59,7 +59,7 @@ apiVersion: v1
kind: Service
metadata:
name: msb-eag
- namespace: "{{ .Values.nsPrefix }}-msb"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: msb-eag
spec:
diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml
index 4d462aa96f..850dd08439 100644
--- a/kubernetes/msb/templates/msb-consul-deployment.yaml
+++ b/kubernetes/msb/templates/msb-consul-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: msb-consul
- namespace: "{{ .Values.nsPrefix }}-msb"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: 1
selector:
diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml
index 5c01febd1e..280e6c39d0 100644
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: msb-discovery
- namespace: "{{ .Values.nsPrefix }}-msb"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.discoveryReplicas }}
selector:
@@ -37,7 +37,7 @@ spec:
name: "msb-discovery"
env:
- name: CONSUL_IP
- value: msb-consul.{{ .Values.nsPrefix }}-msb
+ value: msb-consul.{{ .Values.nsPrefix }}
ports:
- containerPort: {{ .Values.discoveryPort }}
name: msb-discovery
diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index 10cbbe115d..a24b3b012e 100644
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: msb-eag
- namespace: "{{ .Values.nsPrefix }}-msb"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.eagReplicas }}
selector:
@@ -37,9 +37,9 @@ spec:
name: "msb-eag"
env:
- name: CONSUL_IP
- value: msb-consul.{{ .Values.nsPrefix }}-msb
+ value: msb-consul.{{ .Values.nsPrefix }}
- name: SDCLIENT_IP
- value: msb-discovery.{{ .Values.nsPrefix }}-msb
+ value: msb-discovery.{{ .Values.nsPrefix }}
- name: ROUTE_LABELS
value: "visualRange:0"
ports:
diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml
index 18dbc67f86..8a56a5f420 100644
--- a/kubernetes/msb/templates/msb-iag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-iag-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: msb-iag
- namespace: "{{ .Values.nsPrefix }}-msb"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.iagReplicas }}
selector:
@@ -37,9 +37,9 @@ spec:
name: "msb-iag"
env:
- name: CONSUL_IP
- value: msb-consul.{{ .Values.nsPrefix }}-msb
+ value: msb-consul.{{ .Values.nsPrefix }}
- name: SDCLIENT_IP
- value: msb-discovery.{{ .Values.nsPrefix }}-msb
+ value: msb-discovery.{{ .Values.nsPrefix }}
- name: ROUTE_LABELS
value: "visualRange:1"
ports: