Merge branch 'master' into fix/logical-backup-job-cleanup

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -610,6 +610,18 @@ spec:
                   enable_replica_pooler_load_balancer:
                     type: boolean
                     default: false
+                  enable_master_node_port:
+                    type: boolean
+                    default: false
+                  enable_master_pooler_node_port:
+                    type: boolean
+                    default: false
+                  enable_replica_node_port:
+                    type: boolean
+                    default: false
+                  enable_replica_pooler_node_port:
+                    type: boolean
+                    default: false
                   external_traffic_policy:
                     type: string
                     enum:

charts/postgres-operator/crds/postgresqls.yaml

@@ -107,7 +107,7 @@ spec:
                 description: load balancers' source ranges are the same for master
                   and replica services
                 items:
-                  pattern: ^(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\/(\d|[1-2]\d|3[0-2])$
+                  pattern: ^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\/(\d|[1-2]\d|3[0-2])|(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))\/(12[0-8]|1[01][0-9]|[1-9]?[0-9]))$
                   type: string
                 nullable: true
                 type: array
@@ -273,14 +273,26 @@ spec:
                   vars that enable load balancers are pointers because it is important to know if any of them is omitted from the Postgres manifest
                   in that case the var evaluates to nil and the value is taken from the operator config
                 type: boolean
+              enableMasterNodePort:
+                description: |-
+                  vars to enable and configure nodeport services
+                  set ports to 0 or nil to let kubernetes decide which port to use
+                  overrides loadbalancer configuration
+                type: boolean
               enableMasterPoolerLoadBalancer:
                 type: boolean
+              enableMasterPoolerNodePort:
+                type: boolean
               enableReplicaConnectionPooler:
                 type: boolean
               enableReplicaLoadBalancer:
                 type: boolean
+              enableReplicaNodePort:
+                type: boolean
               enableReplicaPoolerLoadBalancer:
                 type: boolean
+              enableReplicaPoolerNodePort:
+                type: boolean
               enableShmVolume:
                 type: boolean
               env:
@@ -3408,6 +3420,12 @@ spec:
                   pattern: '^\ *((Mon|Tue|Wed|Thu|Fri|Sat|Sun):(2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))-((2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))\ *$'
                   type: string
                 type: array
+              masterNodePort:
+                format: int32
+                type: integer
+              masterPoolerNodePort:
+                format: int32
+                type: integer
               masterServiceAnnotations:
                 additionalProperties:
                   type: string
@@ -3712,6 +3730,12 @@ spec:
               replicaLoadBalancer:
                 description: deprecated
                 type: boolean
+              replicaNodePort:
+                format: int32
+                type: integer
+              replicaPoolerNodePort:
+                format: int32
+                type: integer
               replicaServiceAnnotations:
                 additionalProperties:
                   type: string