Merge "[DMAAP] remove field undefined in in statefulset specification"
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>
Wed, 7 Oct 2020 06:46:15 +0000 (06:46 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 7 Oct 2020 06:46:15 +0000 (06:46 +0000)
1  2 
kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml

@@@ -45,25 -45,12 +45,12 @@@ spec
          prometheus.io/port: {{ .Values.prometheus.jmx.port | quote }}
        {{- end }}
      spec:
-       podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            podAffinityTerm:
-              labelSelector:
-                 matchExpressions:
-                   - key: "app"
-                     operator: In
-                     values:
-                     - {{ include "common.name" . }}
-                   - key: "release"
-                     operator: In
-                     values:
-                     - {{ include "common.release" . }}
-              topologyKey: "kubernetes.io/hostname"
        {{- if .Values.nodeAffinity }}
        nodeAffinity:
          {{ toYaml .Values.nodeAffinity | indent 10 }}
        {{- end }}
+       imagePullSecrets:
+       - name: "{{ include "common.namespace" . }}-docker-registry-key"
        initContainers:
        - name: {{ include "common.name" . }}-permission-fixer
          command:
            periodSeconds: {{ .Values.readiness.periodSeconds }}
            timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
          resources:
 -{{ toYaml .Values.resources | indent 10 }}
 +{{ include "common.resources" . | indent 10 }}
          env:
          - name : KAFKA_HEAP_OPTS
            value: "{{ .Values.zkConfig.heapOptions }}"
            requests:
              storage: {{ .Values.persistence.size | quote }}
  {{ end }}
-       imagePullSecrets:
-       - name: "{{ include "common.namespace" . }}-docker-registry-key"