Commit c138ed12 authored by lavado's avatar lavado
Browse files

Merge branch 'fixes_affinity_bug_snmp_ee' into 'master' 

Fixes affinity bug on SNMP EE

See merge request !113
parents 01bce519 7a97eb86

snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml

+10 −9
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ spec: 
  selector:

    matchLabels:

      {{- include "snmpexporter.selectorLabels" . | nindent 6 }}

  template:

    metadata:

      labels:

        {{- include "snmpexporter.selectorLabels" . | nindent 8 }}

    spec:

      affinity:

        podAffinity:

          requiredDuringSchedulingIgnoredDuringExecution:
@@ -18,11 +23,7 @@ spec: 
                operator: In

                values:

                - {{ .Values.global.osm.vnf_id | lower}}

  template:

    metadata:

      labels:

        {{- include "snmpexporter.selectorLabels" . | nindent 8 }}

    spec:

            topologyKey: "kubernetes.io/hostname"

      securityContext:

        runAsUser: 0

      initContainers:

snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ apiVersion: apps/v1 
kind: StatefulSet

metadata:

  name: {{ include "eechart.fullname" . }}

  labels:

    vnf: {{ .Values.global.osm.vnf_id | lower}}

spec:

  serviceName:  {{ include "eechart.fullname" . }} 

  replicas: {{ .Values.replicaCount }}
@@ -16,6 +14,7 @@ spec: 
      labels:

        app.kubernetes.io/name: {{ include "eechart.name" . }}

        app.kubernetes.io/instance: {{ .Release.Name }}

        vnf: {{ .Values.global.osm.vnf_id | lower}}

    spec:

      imagePullSecrets:

      - name: regcred

snmp_ee_vnf/snmp_ee_vnfd.yaml

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ vnfd: 
    execution-environment-list:

    - connection-point-ref: vnf-mgmt

      helm-chart: eechart

      helm-version: v2

      id: monitor

      metric-service: snmpexporter

    id: default-vnf-configuration