From 8bfc6cf8c3d338c84c48201f7a4f274958e721a9 Mon Sep 17 00:00:00 2001 From: BorislavG Date: Tue, 27 Feb 2018 15:04:26 +0000 Subject: Run all components in one namespace Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e Issue-ID: OOM-722 Signed-off-by: BorislavG --- kubernetes/vfc/templates/all-services.yaml | 30 +++++++++++----------- .../vfc/templates/vfc-catalog-deployment.yaml | 6 ++--- .../vfc/templates/vfc-emsdriver-deployment.yaml | 6 ++--- .../vfc/templates/vfc-gvnfmdriver-deployment.yaml | 6 ++--- .../vfc/templates/vfc-hwvnfmdriver-deployment.yaml | 6 ++--- .../vfc/templates/vfc-jujudriver-deployment.yaml | 6 ++--- .../templates/vfc-nokiavnfmdriver-deployment.yaml | 6 ++--- kubernetes/vfc/templates/vfc-nslcm-deployment.yaml | 6 ++--- .../vfc/templates/vfc-resmgr-deployment.yaml | 6 ++--- .../vfc/templates/vfc-vnflcm-deployment.yaml | 6 ++--- .../vfc/templates/vfc-vnfmgr-deployment.yaml | 6 ++--- .../vfc/templates/vfc-vnfres-deployment.yaml | 6 ++--- .../vfc/templates/vfc-workflow-deployment.yaml | 6 ++--- .../templates/vfc-workflow-engine-activity.yaml | 6 ++--- .../templates/vfc-ztesdncdriver-deployment.yaml | 6 ++--- .../vfc-ztevmanagerdriver-deployment.yaml | 6 ++--- kubernetes/vfc/values.yaml | 4 +-- 17 files changed, 62 insertions(+), 62 deletions(-) (limited to 'kubernetes/vfc') diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml index ff9eea4587..36a8d999ac 100755 --- a/kubernetes/vfc/templates/all-services.yaml +++ b/kubernetes/vfc/templates/all-services.yaml @@ -5,7 +5,7 @@ metadata: labels: app: vfc-nslcm name: vfc-nslcm - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -34,7 +34,7 @@ metadata: labels: app: vfc-resmgr name: vfc-resmgr - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -63,7 +63,7 @@ metadata: labels: app: vfc-gvnfmdriver name: vfc-gvnfmdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -92,7 +92,7 @@ metadata: labels: app: vfc-ztevnfmdriver name: vfc-ztevnfmdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -121,7 +121,7 @@ metadata: labels: app: vfc-nokiavnfmdriver name: vfc-nokiavnfmdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -150,7 +150,7 @@ metadata: labels: app: vfc-hwvnfmdriver name: vfc-hwvnfmdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -179,7 +179,7 @@ metadata: labels: app: vfc-ztesdncdriver name: vfc-ztesdncdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -208,7 +208,7 @@ metadata: labels: app: vfc-jujudriver name: vfc-jujudriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -237,7 +237,7 @@ metadata: labels: app: vfc-vnflcm name: vfc-vnflcm - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -266,7 +266,7 @@ metadata: labels: app: vfc-vnfres name: vfc-vnfres - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -295,7 +295,7 @@ metadata: labels: app: vfc-vnfmgr name: vfc-vnfmgr - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -324,7 +324,7 @@ metadata: labels: app: vfc-emsdriver name: vfc-emsdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -353,7 +353,7 @@ metadata: labels: app: vfc-workflow name: vfc-workflow - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -382,7 +382,7 @@ metadata: labels: app: vfc-workflowengineactiviti name: vfc-workflowengineactiviti - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -411,7 +411,7 @@ metadata: labels: app: vfc-catalog name: vfc-catalog - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { diff --git a/kubernetes/vfc/templates/vfc-catalog-deployment.yaml b/kubernetes/vfc/templates/vfc-catalog-deployment.yaml index 1782e24807..0384fefa76 100755 --- a/kubernetes/vfc/templates/vfc-catalog-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-catalog-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-catalog - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.catalog.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-catalog" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.catalog.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml index 6adc0dc833..548bbe7413 100755 --- a/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-emsdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.emsdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-emsdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.emsdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml index 18558afada..02093ce00e 100755 --- a/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-gvnfmdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.gvnfmdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-gvnfmdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.gvnfmdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml index e9d3282ef7..9b73626e74 100755 --- a/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-hwvnfmdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.hwvnfmdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-hwvnfmdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.hwvnfmdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml b/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml index 28a3c1e6b6..127612bed2 100755 --- a/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-jujudriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.jujudriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-jujudriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.jujudriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml index 9a648ca203..4925d1c121 100755 --- a/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-nokiavnfmdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.nokiavnfmdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-nokiavnfmdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.nokiavnfmdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml b/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml index 400a680a9a..618968dd9f 100755 --- a/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-nslcm - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.nslcm.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-nslcm" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.nslcm.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml b/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml index 2c6a895518..a6e8125a1e 100755 --- a/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-resmgr - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.resmgr.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-resmgr" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.resmgr.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml index 0d8922973b..ef4793dfaf 100755 --- a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-vnflcm - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.vnflcm.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-vnflcm" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.vnflcm.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml b/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml index 566c3cabbd..e3eb750678 100755 --- a/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-vnfmgr - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.vnfmgr.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-vnfmgr" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.vnfmgr.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml b/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml index 50b52b1a77..34f2595ccf 100755 --- a/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-vnfres - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.vnfres.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-vnfres" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.vnfres.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml index f19b55fe95..c2a8205d0d 100755 --- a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-workflow - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.workflow.replicas }} selector: @@ -28,7 +28,7 @@ spec: - name: SERVICE_PORT value: "{{ .Values.workflow.port }}" - name: OPENPALETTE_MSB_IP - value: msb-iag.{{ .Values.nsPrefix }}-msb + value: msb-iag.{{ .Values.nsPrefix }} - name: OPENPALETTE_MSB_PORT value: "80" ports: @@ -41,4 +41,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml b/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml index cb18ada997..d22481526c 100755 --- a/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml +++ b/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-workflowengineactiviti - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.workflowengineactiviti.replicas }} selector: @@ -28,7 +28,7 @@ spec: - name: SERVICE_PORT value: "{{ .Values.workflow.port }}" - name: OPENPALETTE_MSB_IP - value: msb-iag.{{ .Values.nsPrefix }}-msb + value: msb-iag.{{ .Values.nsPrefix }} - name: OPENPALETTE_MSB_PORT value: "80" ports: @@ -41,4 +41,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml index 828e7b32b1..9eae38543c 100755 --- a/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-ztesdncdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.ztesdncdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-ztesdncdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.ztesdncdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml index aed359eceb..e79a27ef11 100755 --- a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-ztevnfmdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.ztevnfmdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-ztevnfmdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.ztevnfmdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml index 46aa9b71f8..13fb94f638 100644 --- a/kubernetes/vfc/values.yaml +++ b/kubernetes/vfc/values.yaml @@ -1,6 +1,6 @@ nsPrefix: onap pullPolicy: IfNotPresent -msbaddr: msb-iag.onap-msb:80 +msbaddr: msb-iag.{{ .Values.nsPrefix }}:80 nslcm: image: nexus3.onap.org:10001/onap/vfc/nslcm:v1.0.2 port: 8403 @@ -75,4 +75,4 @@ catalog: image: nexus3.onap.org:10001/onap/vfc/catalog:v1.0.2 port: 8806 nodePort: 30806 - replicas: 1 \ No newline at end of file + replicas: 1 -- cgit 1.2.3-korg