feat!(mirrorbits) 💥 allow specifying custom affinities per deployment

jenkins-infra · Oct 2, 2023 · 6d7b78a · 6d7b78a
1 parent a2dc819
commit 6d7b78a
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 2 deletions.
diff --git a/charts/mirrorbits/templates/_helpers.tpl b/charts/mirrorbits/templates/_helpers.tpl
@@ -31,13 +31,20 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Selector labels
+*/}}
+{{- define "mirrorbits.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "mirrorbits.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
 {{/*
 Common labels
 */}}
 {{- define "mirrorbits.labels" -}}
-app.kubernetes.io/name: {{ include "mirrorbits.name" . }}
+{{ include "mirrorbits.selectorLabels" . }}
 helm.sh/chart: {{ include "mirrorbits.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}

diff --git a/charts/mirrorbits/tests/custom_values_test.yaml b/charts/mirrorbits/tests/custom_values_test.yaml
@@ -22,6 +22,46 @@ set:
       volume:
         persistentVolumeClaim:
           claimName: foobar
+  affinity:
+    mirrorbits:
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: "app.kubernetes.io/name"
+                  operator: In
+                  values:
+                    - mirrorbits
+            topologyKey: "kubernetes.io/hostname"
+    files:
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: "app.kubernetes.io/name"
+                  operator: In
+                  values:
+                    - mirrorbits-files
+            topologyKey: "kubernetes.io/hostname"
+    rsyncd:
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: "app.kubernetes.io/name"
+                  operator: In
+                  values:
+                    - mirrorbits-rsyncd
+            topologyKey: "kubernetes.io/hostname"
+  poddisruptionbudget:
+    mirrorbits:
+      minAvailable: 1
+    mirrorbitsFiles:
+      minAvailable: 1
+    mirrorbitsRsyncd:
+      minAvailable: 1
+
+
 templates:
   - deployment.yaml
   - deployment.files.yaml
@@ -94,6 +134,9 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].volumeMounts[2].mountPath
           value: /var/log/mirrorbits
+      - equal:
+          path: spec.template.spec.affinity.mirrorbits.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution[0].topologyKey
+          value: "kubernetes.io/hostname"
   - it: should create ingress with pathType set to the specified custom value by default
     template: ingress.yaml
     asserts:

diff --git a/charts/mirrorbits/tests/defaults_test.yaml b/charts/mirrorbits/tests/defaults_test.yaml
@@ -88,3 +88,5 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].volumeMounts[2].mountPath
           value: /var/log/mirrorbits
+      - notExists:
+          path: spec.template.spec.affinity