Merge branch 'main' into monitor

Author: zlianzhuang

platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml.template

@@ -99,6 +99,23 @@ spec:
                 enum:
                 - true
                 - false
+              antiaffinity:
+                type: object
+                x-kubernetes-preserve-unknown-fields: true
+                properties:
+                  policy:
+                    type: string
+                    enum:
+                    - 'preferred'
+                    - 'required'
+                  podAntiAffinityTerm:
+                    type: string
+                    enum:
+                    - 'none'
+                    - 'autofailover-readwrite'
+                    - 'autofailover-readwrite-readonly'
+                  topologyKey:
+                    type: string
               services:
                 type: array
                 items:

platforms/kubernetes/postgres-operator/deploy/postgresql.yaml

@@ -6,6 +6,10 @@ metadata:
 spec:
   action: start #stop start
   deletepvc: true
+  antiaffinity:
+    policy: preferred                             # preferred/required
+    podAntiAffinityTerm: autofailover-readwrite   # none/autofailover-readwrite/autofailover-readwrite-readonly
+    topologyKey: "kubernetes.io/hostname"         # when policy is required, only allow "kubernetes.io/hostname"
   services:
     - selector: primary # autofailover/primary/standby/readonly/standby-readonly
       metadata:
@@ -31,7 +35,7 @@ spec:
     podspec:
       terminationGracePeriodSeconds: 60
       containers:
-        - image: docker.io/library/radondb-postgresql:12.12-v1.0.0
+        - image: radondb-postgresql:12.12-v1.0.0
           imagePullPolicy: IfNotPresent
           name: postgresql #can't change the name
           volumeMounts:
@@ -72,7 +76,7 @@ spec:
       podspec:
         terminationGracePeriodSeconds: 60
         containers:
-          - image: docker.io/library/radondb-postgresql:12.12-v1.0.0
+          - image: radondb-postgresql:12.12-v1.0.0
             imagePullPolicy: IfNotPresent
             name: postgresql #can't change the name
             volumeMounts:
@@ -96,7 +100,7 @@ spec:
       podspec:
         terminationGracePeriodSeconds: 60
         containers:
-          - image: docker.io/library/radondb-postgresql:12.12-v1.0.0
+          - image: radondb-postgresql:12.12-v1.0.0
             imagePullPolicy: IfNotPresent
             name: postgresql #can't change the name
             volumeMounts:

platforms/kubernetes/postgres-operator/postgres/constants.py

@@ -106,6 +106,16 @@
 MACHINE_MODE = "machine"
 K8S_MODE = "k8s"
 
+# antiaffinity
+SPEC_ANTIAFFINITY = "antiaffinity"
+SPEC_ANTIAFFINITY_POLICY = "policy"
+SPEC_ANTIAFFINITY_REQUIRED = "required"
+SPEC_ANTIAFFINITY_PREFERRED = "preferred"
+SPEC_ANTIAFFINITY_POLICY_REQUIRED = "requiredDuringSchedulingIgnoredDuringExecution"
+SPEC_ANTIAFFINITY_POLICY_PREFERRED = "preferredDuringSchedulingIgnoredDuringExecution"
+SPEC_ANTIAFFINITY_PODANTIAFFINITYTERM = "podAntiAffinityTerm"
+SPEC_ANTIAFFINITY_TOPOLOGYKEY = "topologyKey"
+
 # docker-compose
 DOCKER_COMPOSE_FILE = "docker-compose.yaml"
 DOCKER_COMPOSE_FILE_DATA = '''