From 81d229d40dede945b392497b17e7c1b440013118 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Tue, 15 Apr 2025 13:35:03 +0200 Subject: [PATCH] fix: add sorcerer node affinity and pod anti-affinity --- values/sorcerer/values-prod.yaml | 26 ++++++++++++++++++++++---- values/sorcerer/values-staging.yaml | 28 ++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/values/sorcerer/values-prod.yaml b/values/sorcerer/values-prod.yaml index 95a3fd99..36713984 100644 --- a/values/sorcerer/values-prod.yaml +++ b/values/sorcerer/values-prod.yaml @@ -68,13 +68,31 @@ persistence: existingClaim: prod-sorcerer-ceph-archives # existingClaim: prod-oceanbox-backup-archives -nodeSelector: - node-role.kubernetes.io/srv: "" - # kubernetes.io/hostname: fs-backup - # node-role.kubernetes.io/worker: c1-1 +# nodeSelector: +# node-role.kubernetes.io/srv: "" +# kubernetes.io/hostname: fs-backup +# node-role.kubernetes.io/worker: c1-1 # tolerations: # - key: workload # operator: Equal # value: compute # effect: NoSchedule + +affinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: "topology.kubernetes.io/group" + operator: In + values: + - srv + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: "app.kubernetes.io/instance" + operator: In + values: + - prod-sorcerer + topologyKey: "kubernetes.io/hostname" diff --git a/values/sorcerer/values-staging.yaml b/values/sorcerer/values-staging.yaml index 04c15414..0ed3f6da 100644 --- a/values/sorcerer/values-staging.yaml +++ b/values/sorcerer/values-staging.yaml @@ -67,12 +67,32 @@ persistence: existingClaim: staging-sorcerer-ceph-archives # existingClaim: staging-oceanbox-backup-archives # -nodeSelector: - node-role.kubernetes.io/srv: "" - # kubernetes.io/hostname: fs-backup - # node-role.kubernetes.io/worker: c1-1 + +# nodeSelector: +# node-role.kubernetes.io/srv: "" +# kubernetes.io/hostname: fs-backup +# node-role.kubernetes.io/worker: c1-1 + # tolerations: # - key: workload # operator: Equal # value: compute # effect: NoSchedule + +affinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: "topology.kubernetes.io/group" + operator: In + values: + - srv + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: "app.kubernetes.io/instance" + operator: In + values: + - staging-sorcerer + topologyKey: "kubernetes.io/hostname"