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/uui | |
| 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/uui')
| -rw-r--r-- | kubernetes/uui/templates/all-services.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/uui/templates/uui-deployment.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/uui/templates/uui-server-deployment.yaml | 8 | ||||
| -rw-r--r-- | kubernetes/uui/values.yaml | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml index 7b23b36808..173fc77ab4 100644 --- a/kubernetes/uui/templates/all-services.yaml +++ b/kubernetes/uui/templates/all-services.yaml @@ -5,7 +5,7 @@ metadata: labels: app: uui name: uui - namespace: "{{ .Values.nsPrefix }}-uui" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -34,7 +34,7 @@ metadata: 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 db7ac1a9da..1e18009be5 100644 --- a/kubernetes/uui/templates/uui-deployment.yaml +++ b/kubernetes/uui/templates/uui-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: uui name: uui - namespace: "{{ .Values.nsPrefix }}-uui" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -26,7 +26,7 @@ spec: name: uui env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: 8080 readinessProbe: @@ -36,4 +36,4 @@ spec: 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 2462a69be1..e3c58a87e6 100644 --- a/kubernetes/uui/templates/uui-server-deployment.yaml +++ b/kubernetes/uui/templates/uui-server-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: uui-server name: uui-server - namespace: "{{ .Values.nsPrefix }}-uui" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -22,9 +22,9 @@ spec: 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 @@ spec: 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 361c68a196..f9e23b0f98 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 |