diff options
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/helm/vsn/templates')
3 files changed, 15 insertions, 13 deletions
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml index 42bd634d..82f8f8b0 100644 --- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml +++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml @@ -3,10 +3,10 @@ kind: ConfigMap metadata: name: {{ .Values.vsn_name_0 }}-configmap labels: + vnf-name: {{ .Values.vnf_name }} + vf-module-name: {{ .Values.vsn_name_0 }} release: {{ .Release.Name }} - app: {{ .Values.vsn_name_0 }} chart: {{ .Chart.Name }} - vnf-name: {{ .Values.vnf_name }} data: - protected_net_gw: {{ (splitn "/" 2 .Values.int_private2_gw_ip)._0 | quote }} + protected_net_gw: {{ .Values.int_private2_gw_ip | quote }} protected_private_net_cidr: {{ .Values.int_private1_net_cidr | quote }} diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml index 4df818e9..6f45ed4a 100644 --- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml +++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml @@ -3,24 +3,25 @@ kind: Deployment metadata: name: {{ .Values.vsn_name_0 }} labels: + vnf-name: {{ .Values.vnf_name }} + vf-module-name: {{ .Values.vsn_name_0 }} release: {{ .Release.Name }} - app: {{ .Values.vsn_name_0 }} chart: {{ .Chart.Name }} - vnf-name: {{ .Values.vnf_name }} spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: - app: {{ .Values.vsn_name_0 }} - release: {{ .Release.Name }} + vnf-name: {{ .Values.vnf_name }} + vf-module-name: {{ .Values.vsn_name_0 }} template: metadata: labels: - app: {{ .Values.vsn_name_0 }} - release: {{ .Release.Name }} vnf-name: {{ .Values.vnf_name }} + vf-module-name: {{ .Values.vsn_name_0 }} + release: {{ .Release.Name }} + chart: {{ .Chart.Name }} annotations: - k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment" + k8s.v1.cni.cncf.io/networks: "{{ .Values.net_attachment_definition }}" k8s.plugin.opnfv.org/nfn-network: | { "type": "ovn4nfv", "interface": [ diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml index 06708ace..967a160d 100644 --- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml +++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: "{{ .Values.vsn_name_0 }}-darkstat-ui" + name: {{ .Values.vsn_name_0 }}-darkstat-ui labels: - app: {{ .Values.vsn_name_0 }} + vnf-name: {{ .Values.vnf_name }} + vf-module-name: {{ .Values.vsn_name_0 }} release: {{ .Release.Name }} chart: {{ .Chart.Name }} - vnf-name: {{ .Values.vnf_name }} spec: type: {{ .Values.service.type }} ports: @@ -15,3 +15,4 @@ spec: selector: app: {{ .Values.vsn_name_0 }} release: {{ .Release.Name }} + chart: {{ .Chart.Name }} |