Commit cdedaae5 authored by Mark Beierl's avatar Mark Beierl
Browse files

Merge branch 'fix-bug-1646' into 'master' 

Set a unique name per release to configMaps

See merge request !199
parents a0a7820f 27937936

magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -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.

magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml

+1 −1
Original line number Diff line number Diff line
@@ -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 }}"

magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/generator.yaml

+2 −2
Original line number Diff line number Diff line 
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}}

magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/mibs.yaml

+2 −2
Original line number Diff line number Diff line 
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 }}

magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml

+2 −2
Original line number Diff line number Diff line
@@ -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 }}