From 28456ffafe714deff5a77cb55cb00960ff8e583f Mon Sep 17 00:00:00 2001 From: Alex Vest Date: Fri, 23 Sep 2022 09:36:38 +0100 Subject: [PATCH] Add PodAntiAffinity if HA is enabled --- .../chart/reloader/templates/_helpers.tpl | 17 ++++++++++++++++- .../chart/reloader/templates/deployment.yaml | 5 ++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl index eb7a701..f481f1e 100644 --- a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl +++ b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl @@ -28,6 +28,21 @@ heritage: {{ .Release.Service | quote }} app.kubernetes.io/managed-by: {{ .Release.Service | quote }} {{- end -}} +{{/* +Create pod anti affinity labels +*/}} +{{- define "reloader-podAntiAffinity" -}} +podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - {{ template "reloader-fullname" . }} + topologyKey: "kubernetes.io/hostname" +{{- end -}} + {{/* Create the name of the service account to use */}} @@ -45,4 +60,4 @@ Create the annotations to support helm3 {{- define "reloader-helm3.annotations" -}} meta.helm.sh/release-namespace: {{ .Release.Namespace | quote }} meta.helm.sh/release-name: {{ .Release.Name | quote }} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml index bb5c920..cf9535c 100644 --- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml +++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml @@ -45,9 +45,12 @@ spec: nodeSelector: {{ toYaml .Values.reloader.deployment.nodeSelector | indent 8 }} {{- end }} - {{- if .Values.reloader.deployment.affinity }} + {{- if or (.Values.reloader.deployment.affinity) (.Values.reloader.enableHA) }} affinity: + {{- if .Values.reloader.deployment.affinity }} {{ toYaml .Values.reloader.deployment.affinity | indent 8 }} + {{- end}} +{{ include "reloader-podAntiAffinity" . | indent 8 }} {{- end }} {{- if .Values.reloader.deployment.tolerations }} tolerations: