From 5c136ada82ffda969fbe450bb32931df170ad4d7 Mon Sep 17 00:00:00 2001 From: Allen Li Date: Fri, 2 Aug 2024 12:57:34 -0400 Subject: [PATCH 1/2] add HA configuration for csdb Signed-off-by: Allen Li --- controllers/constant/odlm.go | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/controllers/constant/odlm.go b/controllers/constant/odlm.go index a8eb84e69..d7a3cd13a 100644 --- a/controllers/constant/odlm.go +++ b/controllers/constant/odlm.go @@ -1238,7 +1238,30 @@ spec: - CREATE DATABASE zen OWNER zen_user - GRANT ALL PRIVILEGES ON DATABASE zen TO zen_user affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/arch + operator: In + values: + - amd64 + - ppc64le + - s390x + additionalPodAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + topologyKey: kubernetes.io/hostname + weight: 50 + podAntiAffinityType: preferred + topologyKey: topology.kubernetes.io/zone + topologySpreadConstraints: + - maxSkew: 1 topologyKey: topology.kubernetes.io/zone + whenUnsatisfiable: ScheduleAnyway + - maxSkew: 1 + topologyKey: topology.kubernetes.io/region + whenUnsatisfiable: ScheduleAnyway imageName: templatingValueFrom: default: From c8fcc9a27beac626448ad277a7c92dbd4d08dc0c Mon Sep 17 00:00:00 2001 From: Allen Li Date: Mon, 12 Aug 2024 15:37:41 -0400 Subject: [PATCH 2/2] add labelselector Signed-off-by: Allen Li --- controllers/constant/odlm.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/controllers/constant/odlm.go b/controllers/constant/odlm.go index d7a3cd13a..bd78de251 100644 --- a/controllers/constant/odlm.go +++ b/controllers/constant/odlm.go @@ -1251,6 +1251,12 @@ spec: additionalPodAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: + labelSelector: + matchExpressions: + - key: k8s.enterprisedb.io/cluster + operator: In + values: + - common-service-db topologyKey: kubernetes.io/hostname weight: 50 podAntiAffinityType: preferred