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/multicloud/templates | |
| 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/multicloud/templates')
5 files changed, 18 insertions, 18 deletions
diff --git a/kubernetes/multicloud/templates/all-services.yaml b/kubernetes/multicloud/templates/all-services.yaml index 09a90d0eca..58e67e03d1 100644 --- a/kubernetes/multicloud/templates/all-services.yaml +++ b/kubernetes/multicloud/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: framework - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" labels: name: framework annotations: @@ -32,7 +32,7 @@ apiVersion: v1 kind: Service metadata: name: multicloud-vio - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" labels: name: multicloud-vio annotations: @@ -62,7 +62,7 @@ apiVersion: v1 kind: Service metadata: name: multicloud-ocata - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" labels: name: multicloud-ocata annotations: @@ -92,7 +92,7 @@ apiVersion: v1 kind: Service metadata: name: multicloud-windriver - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" labels: name: multicloud-windriver annotations: diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml index f585b04787..dcdf0a2d75 100644 --- a/kubernetes/multicloud/templates/framework-deployment.yaml +++ b/kubernetes/multicloud/templates/framework-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: framework - namespace: "{{ .Values.nsPrefix }}-multicloud" + name: multicloud-framework + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -12,17 +12,17 @@ spec: metadata: labels: app: framework - name: framework + name: multicloud-framework spec: hostname: framework containers: - env: - name: MSB_ADDR - value: {{ .Values.msbgateway }} + value: {{ tpl .Values.msbgateway . }} - name: MSB_PORT value: "{{ .Values.msbPort }}" - name: AAI_ADDR - value: aai-service.{{ .Values.nsPrefix }}-aai + value: aai-service.{{ .Values.nsPrefix }} - name: AAI_PORT value: "8443" - name: AAI_SCHEMA_VERSION diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml index 9999b5585d..a8bc983d11 100644 --- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml +++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: multicloud-ocata - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -18,11 +18,11 @@ spec: containers: - env: - name: MSB_ADDR - value: "{{ .Values.msbgateway }}" + value: "{{ tpl .Values.msbgateway . }}" - name: MSB_PORT value: "{{ .Values.msbPort }}" - name: AAI_ADDR - value: aai-service.{{ .Values.nsPrefix }}-aai + value: aai-service.{{ .Values.nsPrefix }} - name: AAI_PORT value: "8443" - name: AAI_SCHEMA_VERSION diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml index c5efdae559..df99542051 100644 --- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml +++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: multicloud-vio - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -18,11 +18,11 @@ spec: containers: - env: - name: MSB_ADDR - value: "{{ .Values.msbgateway }}" + value: "{{ tpl .Values.msbgateway . }}" - name: MSB_PORT value: "{{ .Values.msbPort }}" - name: AAI_ADDR - value: aai-service.{{ .Values.nsPrefix }}-aai + value: aai-service.{{ .Values.nsPrefix }} - name: AAI_PORT value: "8443" - name: AAI_SCHEMA_VERSION diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml index c482aea7fd..2298bee2f2 100644 --- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml +++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: multicloud-windriver - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -18,11 +18,11 @@ spec: containers: - env: - name: MSB_ADDR - value: "{{ .Values.msbgateway }}" + value: "{{ tpl .Values.msbgateway . }}" - name: MSB_PORT value: "{{ .Values.msbPort }}" - name: AAI_ADDR - value: aai-service.{{ .Values.nsPrefix }}-aai + value: aai-service.{{ .Values.nsPrefix }} - name: AAI_PORT value: "8443" - name: AAI_SCHEMA_VERSION |