Merge pull request #104 from markandersontrocme/allow-setting-affinity

Allow setting affinity

Author: kcp-ci-bot

charts/kcp/templates/etcd-statefulset.yaml

@@ -38,6 +38,10 @@ spec:
         {{- include "common.labels" . | nindent 8 }}
         app.kubernetes.io/component: "etcd"
     spec:
+      {{- with .Values.etcd.affinity}}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: etcd
           image: {{ .Values.etcd.image }}:{{ .Values.etcd.tag }}

charts/kcp/templates/front-proxy-deployment.yaml

@@ -58,6 +58,10 @@ spec:
       hostAliases:
         {{- toYaml .Values.kcpFrontProxy.hostAliases.values | nindent 6 }}
       {{- end }}
+      {{- with .Values.kcpFrontProxy.affinity}}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: kcp-front-proxy
           image: "{{ .Values.kcpFrontProxy.image }}:{{- include "frontproxy.version" . }}"

charts/kcp/templates/server-deployment.yaml

@@ -94,6 +94,10 @@ spec:
       hostAliases:
         {{- toYaml .Values.kcp.hostAliases.values | nindent 6 }}
       {{- end }}
+      {{- with .Values.kcp.affinity}}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: kcp
           image: {{ .Values.kcp.image }}:{{- include "kcp.version" . }}

charts/kcp/values.yaml

@@ -21,6 +21,18 @@ etcd:
     enabled: false
     maxUnavailable: 1
   storageClassName: ""
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 1
+          podAffinityTerm:
+            labelSelector:
+              matchExpressions:
+                - key: "app.kubernetes.io/component"
+                  operator: In
+                  values:
+                    - etcd
+            topologyKey: "kubernetes.io/hostname"
 kcp:
   replicas: 1
   strategy:
@@ -79,6 +91,18 @@ kcp:
   podDisruptionBudget:
     enabled: false
     minAvailable: 1
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 1
+          podAffinityTerm:
+            labelSelector:
+              matchExpressions:
+                - key: "app.kubernetes.io/component"
+                  operator: In
+                  values:
+                    - server
+            topologyKey: "kubernetes.io/hostname"
 kcpFrontProxy:
   replicas: 1
   strategy:
@@ -168,6 +192,18 @@ kcpFrontProxy:
   # - name: example-vw-serving-cert
   #   mountPath: /etc/example-vw-serving-cert
   extraFlags: []
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 1
+          podAffinityTerm:
+            labelSelector:
+              matchExpressions:
+                - key: "app.kubernetes.io/component"
+                  operator: In
+                  values:
+                    - front-proxy
+            topologyKey: "kubernetes.io/hostname"
 oidc:
   enabled: false
   caSecretName: ""