Merge branch 'main' into develop-AntiAffinity

Author: zlianzhuang

image/postgres-operator/Dockerfile

@@ -10,7 +10,7 @@ COPY postgres /src
 RUN python -m pip install --trusted-host mirrors.aliyun.com --upgrade pip \
 		-i http://mirrors.aliyun.com/pypi/simple/
 RUN python -m pip install --trusted-host mirrors.aliyun.com --no-cache-dir \
-		Kubernetes kopf wrapt paramiko \
+		Kubernetes==21.7.0 kopf==1.35.5 wrapt paramiko \
 		-i http://mirrors.aliyun.com/pypi/simple/
 
 ENTRYPOINT ["kopf", "run", "--standalone", "-A"]

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

@@ -159,6 +159,8 @@ spec:
                           properties:
                             image:
                               type: string
+                            name:
+                              type: string
                             resources:
                               type: object
                               x-kubernetes-preserve-unknown-fields: true
@@ -220,6 +222,8 @@ spec:
                               properties:
                                 image:
                                   type: string
+                                name:
+                                  type: string
                                 resources:
                                   type: object
                                   x-kubernetes-preserve-unknown-fields: true
@@ -262,6 +266,8 @@ spec:
                               properties:
                                 image:
                                   type: string
+                                name:
+                                  type: string
                                 resources:
                                   type: object
                                   x-kubernetes-preserve-unknown-fields: true

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

@@ -176,6 +176,8 @@ spec:
                           properties:
                             image:
                               type: string
+                            name:
+                              type: string
                             resources:
                               type: object
                               x-kubernetes-preserve-unknown-fields: true
@@ -237,6 +239,8 @@ spec:
                               properties:
                                 image:
                                   type: string
+                                name:
+                                  type: string
                                 resources:
                                   type: object
                                   x-kubernetes-preserve-unknown-fields: true
@@ -279,6 +283,8 @@ spec:
                               properties:
                                 image:
                                   type: string
+                                name:
+                                  type: string
                                 resources:
                                   type: object
                                   x-kubernetes-preserve-unknown-fields: true

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

@@ -42,9 +42,6 @@ spec:
             - name: data # can't change the name
               mountPath: /var/lib/postgresql/data
           resources:
-            requests:
-              memory: "200Mi"
-              cpu: "0.2"
             limits:
               memory: "200Mi"
               cpu: "0.2"
@@ -61,8 +58,6 @@ spec:
       admin:
         - name: root
           password: root
-        - name: root1
-          password: root1
       normal:
         - name: lzzhang
           password: lzzhang
@@ -85,12 +80,9 @@ spec:
               - name: data # can't change the name
                 mountPath: /var/lib/postgresql/data
             resources:
-              requests:
-                memory: "200Mi"
-                cpu: "0.3"
               limits:
                 memory: "200Mi"
-                cpu: "0.3"
+                cpu: "0.2"
       volumeClaimTemplates:
         - metadata:
             name: data
@@ -112,12 +104,9 @@ spec:
               - name: data # can't change the name
                 mountPath: /var/lib/postgresql/data
             resources:
-              requests:
-                memory: "200Mi"
-                cpu: "0.3"
               limits:
                 memory: "200Mi"
-                cpu: "0.3"
+                cpu: "0.2"
       volumeClaimTemplates:
         - metadata:
             name: data

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

@@ -18,7 +18,7 @@
 SPEC = "spec"
 CONTAINERS = "containers"
 CONTAINER_NAME = "name"
-POSTGRESQL_CONTAINER = "postgresql"
+PODSPEC_CONTAINERS_POSTGRESQL_CONTAINER = "postgresql"
 PRIME_SERVICE_PORT_NAME = "prime"
 HBAS = "hbas"
 CONFIGS = "configs"

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

@@ -30,7 +30,7 @@
     SPEC,
     CONTAINERS,
     CONTAINER_NAME,
-    POSTGRESQL_CONTAINER,
+    PODSPEC_CONTAINERS_POSTGRESQL_CONTAINER,
     PRIME_SERVICE_PORT_NAME,
     HBAS,
     CONFIGS,
@@ -578,7 +578,6 @@ def create_statefulset(
     vct: TypedDict,
     antiaffinity_need_copy: TypedDict,
     env: TypedDict,
-    logger: logging.Logger,
 ) -> None:
 
     apps_v1_api = client.AppsV1Api()
@@ -602,7 +601,7 @@ def create_statefulset(
         podspec.setdefault("affinity", {}).setdefault("podAntiAffinity", {})[spec_antiaffinity] = \
             antiaffinity
     for container in podspec[CONTAINERS]:
-        if container[CONTAINER_NAME] == POSTGRESQL_CONTAINER:
+        if container[CONTAINER_NAME] == PODSPEC_CONTAINERS_POSTGRESQL_CONTAINER:
             container["args"] = ["auto_failover"]
             container["env"] = env
             container["readinessProbe"] = {
@@ -761,7 +760,7 @@ def create_postgresql(
         machine_data_path = operator_config.DATA_PATH_POSTGRESQL
 
     for container in localspec[PODSPEC][CONTAINERS]:
-        if container[CONTAINER_NAME] == POSTGRESQL_CONTAINER:
+        if container[CONTAINER_NAME] == PODSPEC_CONTAINERS_POSTGRESQL_CONTAINER:
             postgresql_image = container[IMAGE]
 
     if mode == MACHINE_MODE:
@@ -787,12 +786,14 @@ def create_postgresql(
     for config in configs:
         name = config.split("=")[0].strip()
         value = config[config.find("=") + 1:].strip()
-        config = name + "=" + value
+
         if name in PG_CONFIG_IGNORE:
             continue
+
         if field == get_field(AUTOFAILOVER) and name == 'port':
-            continue
+            value = str(AUTO_FAILOVER_PORT)
 
+        config = name + "=" + value
         if mode == MACHINE_MODE:
             machine_env += PG_CONFIG_PREFIX + config + "\n"
         else:
@@ -2437,7 +2438,7 @@ def correct_user_password(
     PASSWORD_FAILED_MESSAGEd = "password authentication failed for user"
 
     if get_conn_role(conn) == AUTOFAILOVER:
-        port = 55555
+        port = AUTO_FAILOVER_PORT
         user = AUTOCTL_NODE
         password = patch.status.get(AUTOCTL_NODE)
         if password == None: