Refactor FIXMEs in vFW_CDS_CNF use case

[demo.git] / heat / vFW_CNF_CDS / templates / helm / vsn / templates / deployment.yaml

diff --git a/heat/vFW_CNF_CDS/templates/helm/sink/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
similarity index 80%
rename from heat/vFW_CNF_CDS/templates/helm/sink/templates/deployment.yaml
rename to heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
index 578f02f..4df818e 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/helm/sink/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
@@ -4,19 +4,21 @@ metadata:
   name: {{ .Values.vsn_name_0 }}
   labels:
     release: {{ .Release.Name }}
-    app: {{ .Values.vnf_name }} #FIXME Should vnf_name be replaced with v*_name_0 for labels?
+    app: {{ .Values.vsn_name_0 }}
     chart: {{ .Chart.Name }}
+    vnf-name: {{ .Values.vnf_name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.vnf_name }}
+      app: {{ .Values.vsn_name_0 }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ .Values.vnf_name }}
+        app: {{ .Values.vsn_name_0 }}
         release: {{ .Release.Name }}
+        vnf-name: {{ .Values.vnf_name }}
       annotations:
         k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment"
         k8s.plugin.opnfv.org/nfn-network: |
@@ -33,16 +35,6 @@ spec:
               ]
             }
     spec:
-      #FIXME DEBUG START
-      initContainers:
-      - name: init-test
-        image: busybox
-        command:
-            - env
-        envFrom:
-        - configMapRef:
-            name: {{ .Values.vsn_name_0 }}-configmap
-      #FIXME DEBUG END
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.sinkrepo }}:{{ .Values.image.sinktag }}"