Run all components in one namespace
Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml
index 7b23b36..173fc77 100644
--- a/kubernetes/uui/templates/all-services.yaml
+++ b/kubernetes/uui/templates/all-services.yaml
@@ -5,7 +5,7 @@
labels:
app: uui
name: uui
- namespace: "{{ .Values.nsPrefix }}-uui"
+ namespace: "{{ .Values.nsPrefix }}"
annotations:
msb.onap.org/service-info: '[
{
@@ -34,7 +34,7 @@
labels:
app: uui-server
name: uui-server
- namespace: "{{ .Values.nsPrefix }}-uui"
+ namespace: "{{ .Values.nsPrefix }}"
annotations:
msb.onap.org/service-info: '[
{
diff --git a/kubernetes/uui/templates/uui-deployment.yaml b/kubernetes/uui/templates/uui-deployment.yaml
index db7ac1a..1e18009 100644
--- a/kubernetes/uui/templates/uui-deployment.yaml
+++ b/kubernetes/uui/templates/uui-deployment.yaml
@@ -5,7 +5,7 @@
labels:
app: uui
name: uui
- namespace: "{{ .Values.nsPrefix }}-uui"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
@@ -26,7 +26,7 @@
name: uui
env:
- name: MSB_ADDR
- value: {{ .Values.msbaddr }}
+ value: {{ tpl .Values.msbaddr . }}
ports:
- containerPort: 8080
readinessProbe:
@@ -36,4 +36,4 @@
periodSeconds: 10
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/uui/templates/uui-server-deployment.yaml b/kubernetes/uui/templates/uui-server-deployment.yaml
index 2462a69..e3c58a8 100644
--- a/kubernetes/uui/templates/uui-server-deployment.yaml
+++ b/kubernetes/uui/templates/uui-server-deployment.yaml
@@ -5,7 +5,7 @@
labels:
app: uui-server
name: uui-server
- namespace: "{{ .Values.nsPrefix }}-uui"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
@@ -22,9 +22,9 @@
name: uui-server
env:
- name: MSB_ADDR
- value: {{ .Values.msbaddr }}
+ value: {{tpl .Values.msbaddr .}}
- name: MR_ADDR
- value: {{ .Values.mraddr }}
+ value: {{tpl .Values.mraddr .}}
ports:
- containerPort: 8082
readinessProbe:
@@ -34,4 +34,4 @@
periodSeconds: 10
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 361c68a..f9e23b0 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -1,8 +1,8 @@
nsPrefix: onap
pullPolicy: Always
uuiPortPrefix: 303
-msbaddr: msb-iag.onap-msb:80
-mraddr: dmaap.onap-message-router:3904
+msbaddr: msb-iag.{{ .Values.nsPrefix }}:80
+mraddr: dmaap.{{ .Values.nsPrefix }}:3904
image:
uuiImage: nexus3.onap.org:10001/onap/usecase-ui
uuiVersion: v1.0.1