From 2793793612e1e0b273a262c38b6a459d781ae6f2 Mon Sep 17 00:00:00 2001 From: cubag Date: Thu, 23 Jun 2022 00:28:05 +0000 Subject: [PATCH] Set a unique name per release to configMaps --- .../eechart/charts/snmpexporter/templates/base-config.yaml | 2 +- .../eechart/charts/snmpexporter/templates/deployment.yaml | 2 +- .../eechart/charts/snmpexporter/templates/generator.yaml | 4 ++-- .../eechart/charts/snmpexporter/templates/mibs.yaml | 4 ++-- .../helm-charts/eechart/templates/statefulset.yaml | 4 ++-- sample_ee_vnf/helm-charts/eechart/templates/generator.yaml | 4 ++-- sample_ee_vnf/helm-charts/eechart/templates/mibs.yaml | 4 ++-- sample_ee_vnf/helm-charts/eechart/templates/statefulset.yaml | 4 ++-- .../eechart/charts/snmpexporter/templates/base-config.yaml | 2 +- .../eechart/charts/snmpexporter/templates/deployment.yaml | 2 +- snmp_ee_vnf/helm-charts/eechart/templates/generator.yaml | 4 ++-- snmp_ee_vnf/helm-charts/eechart/templates/mibs.yaml | 4 ++-- snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml | 4 ++-- .../eechart/charts/snmpexporter/templates/base-config.yaml | 2 +- .../eechart/charts/snmpexporter/templates/deployment.yaml | 2 +- .../helm-charts/eechart/templates/generator.yaml | 4 ++-- snmp_setcomm_ee_vnf/helm-charts/eechart/templates/mibs.yaml | 4 ++-- .../helm-charts/eechart/templates/statefulset.yaml | 4 ++-- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml index fcf2f181..0766b9eb 100644 --- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml +++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower}}" + name: "snmp-init-config-{{ .Release.Name }}" data: snmp.yml: |- # WARNING: This file was auto-generated using snmp_exporter generator, manual changes will be lost. diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml index 5aef90fe..99772ae9 100644 --- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml +++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml @@ -50,5 +50,5 @@ spec: path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" - name: init-config-volume configMap: - name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower }}" + name: "snmp-init-config-{{ .Release.Name }}" diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/generator.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/generator.yaml index 96f7e237..383bbb19 100644 --- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/generator.yaml +++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/generator.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower }}" + name: "vnf-snmp-generator-{{ .Release.Name }}" data: generator.yml: |- - {{ .Files.Get "snmp/generator.yml" | nindent 4}} \ No newline at end of file + {{ .Files.Get "snmp/generator.yml" | nindent 4}} diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/mibs.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/mibs.yaml index e7b5eab5..d9ac031f 100644 --- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/mibs.yaml +++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/mibs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-mibs-{{ .Release.Name }}" data: -{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }} \ No newline at end of file +{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }} diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml index 5557b9cb..5429ebd7 100644 --- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml +++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml @@ -58,8 +58,8 @@ spec: path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" - name: vnf-mibs configMap: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-mibs-{{ .Release.Name }}" - name: vnf-generator configMap: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-generator-{{ .Release.Name }}" {{- end }} diff --git a/sample_ee_vnf/helm-charts/eechart/templates/generator.yaml b/sample_ee_vnf/helm-charts/eechart/templates/generator.yaml index 96f7e237..383bbb19 100644 --- a/sample_ee_vnf/helm-charts/eechart/templates/generator.yaml +++ b/sample_ee_vnf/helm-charts/eechart/templates/generator.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower }}" + name: "vnf-snmp-generator-{{ .Release.Name }}" data: generator.yml: |- - {{ .Files.Get "snmp/generator.yml" | nindent 4}} \ No newline at end of file + {{ .Files.Get "snmp/generator.yml" | nindent 4}} diff --git a/sample_ee_vnf/helm-charts/eechart/templates/mibs.yaml b/sample_ee_vnf/helm-charts/eechart/templates/mibs.yaml index e7b5eab5..d9ac031f 100644 --- a/sample_ee_vnf/helm-charts/eechart/templates/mibs.yaml +++ b/sample_ee_vnf/helm-charts/eechart/templates/mibs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-mibs-{{ .Release.Name }}" data: -{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }} \ No newline at end of file +{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }} diff --git a/sample_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/sample_ee_vnf/helm-charts/eechart/templates/statefulset.yaml index a13cfa6e..11238610 100755 --- a/sample_ee_vnf/helm-charts/eechart/templates/statefulset.yaml +++ b/sample_ee_vnf/helm-charts/eechart/templates/statefulset.yaml @@ -56,10 +56,10 @@ spec: path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" - name: vnf-mibs configMap: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-mibs-{{ .Release.Name }}" - name: vnf-generator configMap: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-generator-{{ .Release.Name }}" - name: osm-ee hostPath: path: /var/lib/osm/osm/osm_osm_packages/_data diff --git a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml index fcf2f181..0766b9eb 100644 --- a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml +++ b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower}}" + name: "snmp-init-config-{{ .Release.Name }}" data: snmp.yml: |- # WARNING: This file was auto-generated using snmp_exporter generator, manual changes will be lost. diff --git a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml index be0692bf..aa50011e 100644 --- a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml +++ b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml @@ -60,5 +60,5 @@ spec: path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" - name: init-config-volume configMap: - name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower }}" + name: "snmp-init-config-{{ .Release.Name }}" diff --git a/snmp_ee_vnf/helm-charts/eechart/templates/generator.yaml b/snmp_ee_vnf/helm-charts/eechart/templates/generator.yaml index 96f7e237..383bbb19 100644 --- a/snmp_ee_vnf/helm-charts/eechart/templates/generator.yaml +++ b/snmp_ee_vnf/helm-charts/eechart/templates/generator.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower }}" + name: "vnf-snmp-generator-{{ .Release.Name }}" data: generator.yml: |- - {{ .Files.Get "snmp/generator.yml" | nindent 4}} \ No newline at end of file + {{ .Files.Get "snmp/generator.yml" | nindent 4}} diff --git a/snmp_ee_vnf/helm-charts/eechart/templates/mibs.yaml b/snmp_ee_vnf/helm-charts/eechart/templates/mibs.yaml index e7b5eab5..d9ac031f 100644 --- a/snmp_ee_vnf/helm-charts/eechart/templates/mibs.yaml +++ b/snmp_ee_vnf/helm-charts/eechart/templates/mibs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-mibs-{{ .Release.Name }}" data: -{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }} \ No newline at end of file +{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }} diff --git a/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml index 24cc1db2..9b84df10 100755 --- a/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml +++ b/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml @@ -51,10 +51,10 @@ spec: path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" - name: vnf-mibs configMap: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-mibs-{{ .Release.Name }}" - name: vnf-generator configMap: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-generator-{{ .Release.Name }}" - name: osm-ee hostPath: path: /var/lib/osm/osm/osm_osm_packages/_data diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml index fcf2f181..0766b9eb 100644 --- a/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml +++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower}}" + name: "snmp-init-config-{{ .Release.Name }}" data: snmp.yml: |- # WARNING: This file was auto-generated using snmp_exporter generator, manual changes will be lost. diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml index 314b87f5..749c343d 100644 --- a/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml +++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml @@ -60,5 +60,5 @@ spec: path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" - name: init-config-volume configMap: - name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower }}" + name: "snmp-init-config-{{ .Release.Name }}" diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/generator.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/generator.yaml index 96f7e237..383bbb19 100644 --- a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/generator.yaml +++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/generator.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower }}" + name: "vnf-snmp-generator-{{ .Release.Name }}" data: generator.yml: |- - {{ .Files.Get "snmp/generator.yml" | nindent 4}} \ No newline at end of file + {{ .Files.Get "snmp/generator.yml" | nindent 4}} diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/mibs.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/mibs.yaml index e7b5eab5..d9ac031f 100644 --- a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/mibs.yaml +++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/mibs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-mibs-{{ .Release.Name }}" data: -{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }} \ No newline at end of file +{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }} diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml index 8b124995..22fa77b0 100755 --- a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml +++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml @@ -53,10 +53,10 @@ spec: path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" - name: vnf-mibs configMap: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-mibs-{{ .Release.Name }}" - name: vnf-generator configMap: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" + name: "vnf-snmp-generator-{{ .Release.Name }}" - name: osm-ee hostPath: path: /var/lib/osm/osm/osm_osm_packages/_data -- GitLab