diff options
| author |   Satoshi Fujii <fujii-satoshi@jp.fujitsu.com> | 2021-07-04 16:39:41 +0000 |
|---|---|---|
| committer |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-07-12 15:52:11 +0000 |
| commit | 54bfd171646157f20c00437ebd0afcc7d6bc0c13 (patch) | |
| tree | 7013659c82780caf7b1891e1ce357deb7b3b8598 /kubernetes/sdnc/templates | |
| parent | 2d41088cf4ef1f1b8459c4799cddcdbc8088d2d5 (diff) | |
[SDNC] Fix indent level for nodeSelector and affinity
When nodeSelector was given by values or override.yaml, helm deploy
was failed due to wrong indentation in helm charts.
This change fixed indentation level for nodeSelector and affinity
in pod spec.
Issue-ID: SDNC-1565
Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com>
Change-Id: Ie5446928e3f32d9333c04245fc0d2c0f98b3b4e7
Diffstat (limited to 'kubernetes/sdnc/templates')
| -rwxr-xr-x | kubernetes/sdnc/templates/job.yaml | 11 | ||||
| -rw-r--r-- | kubernetes/sdnc/templates/statefulset.yaml | 18 |
2 files changed, 11 insertions, 18 deletions
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml index 9f6273d5ff..11b1a87128 100755 --- a/kubernetes/sdnc/templates/job.yaml +++ b/kubernetes/sdnc/templates/job.yaml @@ -132,15 +132,12 @@ spec: - /bin/bash args: - {{.Values.config.binDir }}/installSdncDb.sh - resources: -{{ include "common.resources" . | indent 12 }} + resources: {{ include "common.resources" . | nindent 10 }} {{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 10 }} - {{- end -}} + nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }} + {{- end }} {{- if .Values.affinity }} - affinity: -{{ toYaml .Values.affinity | indent 10 }} + affinity: {{ toYaml .Values.affinity | nindent 8 }} {{- end }} volumes: - name: localtime diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index f0ee8a9456..39407e3f5a 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -380,17 +380,7 @@ spec: name: properties subPath: oauth-provider.config.json {{ end }} - resources: -{{ include "common.resources" . | indent 12 }} - {{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 10 }} - {{- end -}} - {{- if .Values.affinity }} - affinity: -{{ toYaml .Values.affinity | indent 10 }} - {{- end }} - + resources: {{ include "common.resources" . | nindent 12 }} # side car containers - name: filebeat-onap image: {{ include "repositoryGenerator.image.logging" . }} @@ -403,6 +393,12 @@ spec: name: logs - mountPath: /usr/share/filebeat/data name: data-filebeat + {{- if .Values.nodeSelector }} + nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }} + {{- end }} + {{- if .Values.affinity }} + affinity: {{ toYaml .Values.affinity | nindent 8 }} + {{- end }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" volumes: |