From 08c3f456393436d42d95d43503ced431a10031e3 Mon Sep 17 00:00:00 2001 From: mahendrr Date: Thu, 12 Apr 2018 06:57:07 +0000 Subject: VFC Communication fails because MSB service name Change-Id: I26e27cfb3b973bbffd0a94e3ec8411f5218cdf4f Issue-ID: OOM-804 Signed-off-by: mahendrr --- kubernetes/onap/values.yaml | 2 +- kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-catalog/values.yaml | 4 +--- kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-ems-driver/values.yaml | 4 +--- .../vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml | 4 +--- .../vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml | 4 +--- .../vfc/charts/vfc-juju-vnfm-driver/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml | 4 +--- kubernetes/vfc/charts/vfc-multivim-proxy/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-multivim-proxy/values.yaml | 4 +--- .../vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/values.yaml | 3 +-- .../vfc/charts/vfc-nokia-vnfm-driver/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-nokia-vnfm-driver/values.yaml | 4 +--- kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-nslcm/values.yaml | 4 +--- kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-resmgr/values.yaml | 4 +--- kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-vnflcm/values.yaml | 4 +--- kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-vnfmgr/values.yaml | 4 +--- kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-vnfres/values.yaml | 4 +--- .../vfc/charts/vfc-workflow-engine/templates/deployment.yaml | 4 ++-- kubernetes/vfc/charts/vfc-workflow-engine/values.yaml | 4 +--- kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml | 4 ++-- kubernetes/vfc/charts/vfc-workflow/values.yaml | 4 +--- .../vfc/charts/vfc-zte-sdnc-driver/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-zte-sdnc-driver/values.yaml | 4 +--- .../vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml | 3 +-- kubernetes/vfc/values.yaml | 7 ++++++- 36 files changed, 43 insertions(+), 70 deletions(-) diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index 5203da3202..f784eebe30 100644 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -120,7 +120,7 @@ so: uui: enabled: true vfc: - enabled: false + enabled: true vid: enabled: true vnfsdk: diff --git a/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml index 3b6f00bf36..084c320e31 100644 --- a/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-catalog/values.yaml b/kubernetes/vfc/charts/vfc-catalog/values.yaml index c5426994a3..fe84a68871 100644 --- a/kubernetes/vfc/charts/vfc-catalog/values.yaml +++ b/kubernetes/vfc/charts/vfc-catalog/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml index bf7a1c9e94..ba33ec587d 100644 --- a/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/kubernetes/vfc/charts/vfc-ems-driver/values.yaml b/kubernetes/vfc/charts/vfc-ems-driver/values.yaml index 0bf5c90e04..d73a72b17b 100644 --- a/kubernetes/vfc/charts/vfc-ems-driver/values.yaml +++ b/kubernetes/vfc/charts/vfc-ems-driver/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml index 566e55d864..825bdcec63 100644 --- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml index 2c8dc44e89..48b039c2a4 100644 --- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml +++ b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml index 450d4ad683..eed1906d26 100644 --- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml index 8c3739b037..3b3f1c6da2 100644 --- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml +++ b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/deployment.yaml index 9f9c59a2cd..1d1a5d7702 100644 --- a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName}}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml index e5e1a7688d..edcce9548e 100644 --- a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml +++ b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-multivim-proxy/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-multivim-proxy/templates/deployment.yaml index bf7a1c9e94..ba33ec587d 100644 --- a/kubernetes/vfc/charts/vfc-multivim-proxy/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-multivim-proxy/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/kubernetes/vfc/charts/vfc-multivim-proxy/values.yaml b/kubernetes/vfc/charts/vfc-multivim-proxy/values.yaml index 5e6b56e558..943b051f8c 100644 --- a/kubernetes/vfc/charts/vfc-multivim-proxy/values.yaml +++ b/kubernetes/vfc/charts/vfc-multivim-proxy/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml index bf7a1c9e94..ba33ec587d 100644 --- a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/values.yaml index 3d620abbb5..e6fe78b610 100644 --- a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/values.yaml +++ b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/values.yaml @@ -36,8 +36,7 @@ debugEnabled: false # application configuration # Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/deployment.yaml index a06e3830fe..9c4437ee0c 100644 --- a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/values.yaml index c9f6309672..4fccdb2c5b 100644 --- a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/values.yaml +++ b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml index a91576d382..b2481c8f33 100644 --- a/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-nslcm/values.yaml b/kubernetes/vfc/charts/vfc-nslcm/values.yaml index 6f9d4eb4ae..a14b06ec26 100644 --- a/kubernetes/vfc/charts/vfc-nslcm/values.yaml +++ b/kubernetes/vfc/charts/vfc-nslcm/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml index 9012540d69..27d5fcdd43 100644 --- a/kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-resmgr/values.yaml b/kubernetes/vfc/charts/vfc-resmgr/values.yaml index 5d9776510e..c128cb08d4 100644 --- a/kubernetes/vfc/charts/vfc-resmgr/values.yaml +++ b/kubernetes/vfc/charts/vfc-resmgr/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml index 22f8bc4ab0..ccea328c0c 100644 --- a/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-vnflcm/values.yaml b/kubernetes/vfc/charts/vfc-vnflcm/values.yaml index 640a79b679..a3f35d4c03 100644 --- a/kubernetes/vfc/charts/vfc-vnflcm/values.yaml +++ b/kubernetes/vfc/charts/vfc-vnflcm/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml index c3d1cdf5b2..9d31443088 100644 --- a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/values.yaml b/kubernetes/vfc/charts/vfc-vnfmgr/values.yaml index bab78f6a3f..96e6b0d2a2 100644 --- a/kubernetes/vfc/charts/vfc-vnfmgr/values.yaml +++ b/kubernetes/vfc/charts/vfc-vnfmgr/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml index 2cc7565899..52e807abe5 100644 --- a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-vnfres/values.yaml b/kubernetes/vfc/charts/vfc-vnfres/values.yaml index dd47766965..3009f5f759 100644 --- a/kubernetes/vfc/charts/vfc-vnfres/values.yaml +++ b/kubernetes/vfc/charts/vfc-vnfres/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-workflow-engine/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-workflow-engine/templates/deployment.yaml index e3605f801f..adb077a518 100644 --- a/kubernetes/vfc/charts/vfc-workflow-engine/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-workflow-engine/templates/deployment.yaml @@ -74,9 +74,9 @@ spec: - name: SERVICE_PORT value: "{{ .Values.config.workflowPort }}" - name: OPENPALETTE_MSB_IP - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}" + value: "{{ .Values.global.config.msbServiceName }}" - name: OPENPALETTE_MSB_PORT - value: "{{ .Values.config.msbPort | default 80 }}" + value: "{{ .Values.global.config.msbPort | default 80 }}" resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/kubernetes/vfc/charts/vfc-workflow-engine/values.yaml b/kubernetes/vfc/charts/vfc-workflow-engine/values.yaml index c5a99b60bd..876547c8c4 100644 --- a/kubernetes/vfc/charts/vfc-workflow-engine/values.yaml +++ b/kubernetes/vfc/charts/vfc-workflow-engine/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -config: - msbPort: 80 - workflowPort: 10550 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml index 64fab80bac..e2b3d0bc96 100644 --- a/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml @@ -74,9 +74,9 @@ spec: - name: SERVICE_PORT value: "{{ .Values.service.externalPort }}" - name: OPENPALETTE_MSB_IP - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}" + value: "{{ .Values.global.config.msbServiceName }}" - name: OPENPALETTE_MSB_PORT - value: "{{ .Values.config.msbPort | default 80 }}" + value: "{{ .Values.global.config.msbPort | default 80 }}" resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/kubernetes/vfc/charts/vfc-workflow/values.yaml b/kubernetes/vfc/charts/vfc-workflow/values.yaml index e683c30351..028155eb32 100644 --- a/kubernetes/vfc/charts/vfc-workflow/values.yaml +++ b/kubernetes/vfc/charts/vfc-workflow/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/deployment.yaml index bf7a1c9e94..ba33ec587d 100644 --- a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/values.yaml b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/values.yaml index 199bc7e1ab..41482bc9f0 100644 --- a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/values.yaml +++ b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/values.yaml @@ -35,9 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -# Example: -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml index 75931c3003..7a0f4a1132 100644 --- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MSB_ADDR - value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}" + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml index 7c1f8efe96..79c1627198 100644 --- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml +++ b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml @@ -35,8 +35,7 @@ pullPolicy: Always debugEnabled: false # application configuration -config: - msbPort: 80 +config: {} # default number of instances replicaCount: 1 diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml index aac8039a72..5a8fa38eb9 100644 --- a/kubernetes/vfc/values.yaml +++ b/kubernetes/vfc/values.yaml @@ -12,6 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +global: + config: + msbServiceName: msb-iag + msbPort: 80 + # application configuration config: logstashServiceName: log-ls @@ -24,4 +29,4 @@ vfc-workflow: vfc-workflow-engine: config: - workflowPort: 10550 \ No newline at end of file + workflowPort: 10550 -- cgit 1.2.3-korg