summaryrefslogtreecommitdiffstats
path: root/kubernetes/esr/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/esr/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/esr/templates')
-rw-r--r--kubernetes/esr/templates/all-services.yaml4
-rw-r--r--kubernetes/esr/templates/esr-esrgui-deployment.yaml6
-rw-r--r--kubernetes/esr/templates/esr-esrserver-deployment.yaml6
3 files changed, 8 insertions, 8 deletions
diff --git a/kubernetes/esr/templates/all-services.yaml b/kubernetes/esr/templates/all-services.yaml
index 68f0db7516..e0c5075e50 100644
--- a/kubernetes/esr/templates/all-services.yaml
+++ b/kubernetes/esr/templates/all-services.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: esr-esrserver
name: esr-esrserver
- namespace: "{{ .Values.nsPrefix }}-esr"
+ namespace: "{{ .Values.nsPrefix }}"
annotations:
msb.onap.org/service-info: '[
{
@@ -32,7 +32,7 @@ metadata:
labels:
app: esr-esrgui
name: esr-esrgui
- namespace: "{{ .Values.nsPrefix }}-esr"
+ namespace: "{{ .Values.nsPrefix }}"
annotations:
msb.onap.org/service-info: '[
{
diff --git a/kubernetes/esr/templates/esr-esrgui-deployment.yaml b/kubernetes/esr/templates/esr-esrgui-deployment.yaml
index 6c3ddf404d..f9ec271515 100644
--- a/kubernetes/esr/templates/esr-esrgui-deployment.yaml
+++ b/kubernetes/esr/templates/esr-esrgui-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: esr-esrgui
name: esr-esrgui
- namespace: "{{ .Values.nsPrefix }}-esr"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
@@ -22,7 +22,7 @@ spec:
name: esr-esrgui
env:
- name: MSB_ADDR
- value: {{ .Values.msbaddr }}
+ value: {{ tpl .Values.msbaddr . }}
ports:
- containerPort: {{ .Values.esrgui.port }}
readinessProbe:
@@ -32,4 +32,4 @@ spec:
periodSeconds: 10
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/esr/templates/esr-esrserver-deployment.yaml b/kubernetes/esr/templates/esr-esrserver-deployment.yaml
index 7724fa0d24..386d4014e4 100644
--- a/kubernetes/esr/templates/esr-esrserver-deployment.yaml
+++ b/kubernetes/esr/templates/esr-esrserver-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: esr-esrserver
name: esr-esrserver
- namespace: "{{ .Values.nsPrefix }}-esr"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
@@ -22,7 +22,7 @@ spec:
name: esr-esrserver
env:
- name: MSB_ADDR
- value: {{ .Values.msbaddr }}
+ value: {{ tpl .Values.msbaddr . }}
ports:
- containerPort: {{ .Values.esrserver.port }}
readinessProbe:
@@ -32,4 +32,4 @@ spec:
periodSeconds: 10
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}