Skip to content

yaml template style: use nindent for nodeSelector, affinity, tolerations #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arm4b merged 2 commits into from
Jul 5, 2021
Merged

yaml template style: use nindent for nodeSelector, affinity, tolerations #216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3becf16
use nindent for nodeSelector, affinity, tolerations
cognifloyd Jul 3, 2021
bdc60dc
Merge branch 'master' into nindent-adv-pod-placement
cognifloyd Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 39 additions & 78 deletions templates/deployments.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,13 @@ spec:
emptyDir:
medium: Memory
{{- with .Values.st2auth.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2auth.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2auth.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

---
Expand Down Expand Up @@ -218,16 +215,13 @@ spec:
{{- include "packs-volumes" . | indent 8 }}
{{- end }}
{{- with .Values.st2api.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2api.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2api.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

---
Expand Down Expand Up @@ -301,16 +295,13 @@ spec:
configMap:
name: {{ .Release.Name }}-st2-config
{{- with .Values.st2stream.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2stream.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2stream.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

---
Expand Down Expand Up @@ -400,16 +391,13 @@ spec:
volumes: []
{{- end }}
{{- with .Values.st2web.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2web.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2web.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

---
Expand Down Expand Up @@ -489,16 +477,13 @@ spec:
path: datastore_key.json
{{- end }}
{{- with .Values.st2rulesengine.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2rulesengine.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2rulesengine.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

---
Expand Down Expand Up @@ -571,16 +556,13 @@ spec:
configMap:
name: {{ .Release.Name }}-st2-config
{{- with .Values.st2timersengine.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2timersengine.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2timersengine.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

---
Expand Down Expand Up @@ -666,16 +648,13 @@ spec:
path: datastore_key.json
{{- end }}
{{- with .Values.st2workflowengine.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2workflowengine.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2workflowengine.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

---
Expand Down Expand Up @@ -760,16 +739,13 @@ spec:
configMap:
name: {{ .Release.Name }}-st2-config
{{- with .Values.st2scheduler.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2scheduler.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2scheduler.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

---
Expand Down Expand Up @@ -841,16 +817,13 @@ spec:
configMap:
name: {{ .Release.Name }}-st2-config
{{- with .Values.st2notifier.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2notifier.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2notifier.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

{{- range .Values.st2.packs.sensors }}
Expand Down Expand Up @@ -972,16 +945,13 @@ spec:
{{- include "packs-volumes" $ | indent 8 }}
{{- end }}
{{- with .nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}

Expand Down Expand Up @@ -1102,16 +1072,13 @@ spec:
{{- include "packs-volumes" . | indent 8 }}
{{- end }}
{{- with .Values.st2actionrunner.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2actionrunner.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2actionrunner.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

---
Expand Down Expand Up @@ -1183,16 +1150,13 @@ spec:
configMap:
name: {{ .Release.Name }}-st2-config
{{- with .Values.st2garbagecollector.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2garbagecollector.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2garbagecollector.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}

---
Expand Down Expand Up @@ -1457,15 +1421,12 @@ spec:
{{- toYaml .Values.st2chatops.hubotScriptsVolume | nindent 10 }}
{{- end }}
{{- with .Values.st2chatops.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2chatops.affinity }}
affinity:
{{ toYaml . | indent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.st2chatops.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}