use old LB DNS format when teamId prefix is disabled (zalando#2011)

* use old LB DNS format when teamId prefix is disabled
* support both old and new format in external-dns
* switch dns template from team to namespace

Author: FxKu

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -424,10 +424,10 @@ spec:
                     default: "Cluster"
                   master_dns_name_format:
                     type: string
-                    default: "{cluster}.{team}.{hostedzone}"
+                    default: "{cluster}.{namespace}.{hostedzone}"
                   replica_dns_name_format:
                     type: string
-                    default: "{cluster}-repl.{team}.{hostedzone}"
+                    default: "{cluster}-repl.{namespace}.{hostedzone}"
               aws_or_gcp:
                 type: object
                 properties:

charts/postgres-operator/values.yaml

@@ -269,9 +269,9 @@ configLoadBalancer:
   # define external traffic policy for the load balancer
   external_traffic_policy: "Cluster"
   # defines the DNS name string template for the master load balancer cluster
-  master_dns_name_format: "{cluster}.{team}.{hostedzone}"
+  master_dns_name_format: "{cluster}.{namespace}.{hostedzone}"
   # defines the DNS name string template for the replica load balancer cluster
-  replica_dns_name_format: "{cluster}-repl.{team}.{hostedzone}"
+  replica_dns_name_format: "{cluster}-repl.{namespace}.{hostedzone}"
 
 # options to aid debugging of the operator itself
 configDebug:

docs/reference/operator_parameters.md

@@ -617,15 +617,15 @@ In the CRD-based configuration they are grouped under the `load_balancer` key.
 
 * **master_dns_name_format** defines the DNS name string template for the
   master load balancer cluster.  The default is
-  `{cluster}.{team}.{hostedzone}`, where `{cluster}` is replaced by the cluster
-  name, `{team}` is replaced with the team name and `{hostedzone}` is replaced
+  `{cluster}.{namespace}.{hostedzone}`, where `{cluster}` is replaced by the cluster
+  name, `{namespace}` is replaced with the namespace and `{hostedzone}` is replaced
   with the hosted zone (the value of the `db_hosted_zone` parameter). No other
   placeholders are allowed.
 
 * **replica_dns_name_format** defines the DNS name string template for the
   replica load balancer cluster.  The default is
-  `{cluster}-repl.{team}.{hostedzone}`, where `{cluster}` is replaced by the
-  cluster name, `{team}` is replaced with the team name and `{hostedzone}` is
+  `{cluster}-repl.{namespace}.{hostedzone}`, where `{cluster}` is replaced by the
+  cluster name, `{namespace}` is replaced with the namespace and `{hostedzone}` is
   replaced with the hosted zone (the value of the `db_hosted_zone` parameter).
   No other placeholders are allowed.
 

docs/user.md

@@ -152,7 +152,7 @@ specified explicitly.
 
 The operator automatically generates a password for each manifest role and
 places it in the secret named
-`{username}.{team}-{clustername}.credentials.postgresql.acid.zalan.do` in the
+`{username}.{clustername}.credentials.postgresql.acid.zalan.do` in the
 same namespace as the cluster. This way, the application running in the
 K8s cluster and connecting to Postgres can obtain the password right from the
 secret, without ever sharing it outside of the cluster.
@@ -182,7 +182,7 @@ be in the form of `namespace.username`.
 
 For such usernames, the secret is created in the given namespace and its name is
 of the following form,
-`{namespace}.{username}.{team}-{clustername}.credentials.postgresql.acid.zalan.do`
+`{namespace}.{username}.{clustername}.credentials.postgresql.acid.zalan.do`
 
 ### Infrastructure roles
 

manifests/configmap.yaml

@@ -87,7 +87,7 @@ data:
   logical_backup_schedule: "30 00 * * *"
   major_version_upgrade_mode: "manual"
   # major_version_upgrade_team_allow_list: ""
-  master_dns_name_format: "{cluster}.{team}.{hostedzone}"
+  master_dns_name_format: "{cluster}.{namespace}.{hostedzone}"
   # master_pod_move_timeout: 20m
   # max_instances: "-1"
   # min_instances: "-1"
@@ -124,7 +124,7 @@ data:
   ready_wait_interval: 3s
   ready_wait_timeout: 30s
   repair_period: 5m
-  replica_dns_name_format: "{cluster}-repl.{team}.{hostedzone}"
+  replica_dns_name_format: "{cluster}-repl.{namespace}.{hostedzone}"
   replication_username: standby
   resource_check_interval: 3s
   resource_check_timeout: 10m

manifests/operatorconfiguration.crd.yaml

@@ -422,10 +422,10 @@ spec:
                     default: "Cluster"
                   master_dns_name_format:
                     type: string
-                    default: "{cluster}.{team}.{hostedzone}"
+                    default: "{cluster}.{namespace}.{hostedzone}"
                   replica_dns_name_format:
                     type: string
-                    default: "{cluster}-repl.{team}.{hostedzone}"
+                    default: "{cluster}-repl.{namespace}.{hostedzone}"
               aws_or_gcp:
                 type: object
                 properties:

manifests/postgresql-operator-default-configuration.yaml

@@ -133,8 +133,8 @@ configuration:
     enable_replica_load_balancer: false
     enable_replica_pooler_load_balancer: false
     external_traffic_policy: "Cluster"
-    master_dns_name_format: "{cluster}.{team}.{hostedzone}"
-    replica_dns_name_format: "{cluster}-repl.{team}.{hostedzone}"
+    master_dns_name_format: "{cluster}.{namespace}.{hostedzone}"
+    replica_dns_name_format: "{cluster}-repl.{namespace}.{hostedzone}"
   aws_or_gcp:
     # additional_secret_mount: "some-secret-name"
     # additional_secret_mount_path: "/some/dir"