Slimming out README and config map, targeting easy first time deployers to minicube.

manifests/configmap.yaml

@@ -2,26 +2,43 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: postgres-operator
-data:
-  # the env var with the same name in the operator pod may overwrite this value
-  # if neither is set or evaluates to the empty string, listen to the operator's own namespace
+data:  
   # if set to the "*", listen to all namespaces
   # watched_namespace: development
   cluster_labels: application:spilo
   cluster_name_label: version
   pod_role_label: spilo-role
-  db_hosted_zone: db.example.com
+
   debug_logging: "true"
-  master_dns_name_format: '{cluster}.{team}.staging.{hostedzone}'
-  replica_dns_name_format: '{cluster}-repl.{team}.staging.{hostedzone}'
+  workers: "4"
   docker_image: registry.opensource.zalan.do/acid/demospilo-10:1.3-p3
   secret_name_template: '{username}.{cluster}.credentials'
-  etcd_host: ""
-  infrastructure_roles_secret_name: postgresql-infrastructure-roles
-  oauth_token_secret_name: postgresql-operator
-  pam_configuration: |
-    https://info.example.com/oauth2/tokeninfo?access_token= uid realm=/employees
-  pam_role_name: zalandos
+  # etcd_host: ""
+  super_username: postgres
+  enable_teams_api: "false"
+  # enable_team_superuser: "false"
+  # team_admin_role: "admin"
+  # teams_api_url: http://fake-teams-api.default.svc.cluster.local
+  # team_api_role_configuration: "log_statement:all"
+  # infrastructure_roles_secret_name: postgresql-infrastructure-roles
+  # oauth_token_secret_name: postgresql-operator
+  # pam_role_name: zalandos
+  # pam_configuration: |
+  #  https://info.example.com/oauth2/tokeninfo?access_token= uid realm=/employees
+  db_hosted_zone: db.example.com
+  master_dns_name_format: '{cluster}.{team}.staging.{hostedzone}'
+  replica_dns_name_format: '{cluster}-repl.{team}.staging.{hostedzone}'
+  enable_master_load_balancer: "false"
+  enable_replica_load_balancer: "false"
+
+  pdb_name_format: "postgres-{cluster}-pdb"
+  node_eol_label: "lifecycle-status:pending-decommission"
+  node_readiness_label: ""
+
+  api_port: "8080"
+  ring_log_lines: "100"
+  cluster_history_entries: "1000"
+  pod_terminate_grace_period: 5m
   pod_deletion_wait_timeout: 10m
   pod_label_wait_timeout: 10m
   ready_wait_interval: 3s
@@ -30,21 +47,3 @@ data:
   resource_check_interval: 3s
   resource_check_timeout: 10m
   resync_period: 5m
-  super_username: postgres
-  enable_teams_api: "false"
-  enable_team_superuser: "false"
-  team_admin_role: "admin"
-  teams_api_url: http://fake-teams-api.default.svc.cluster.local
-  workers: "4"
-  # turn on/off load balancers for all Postgres clusters managed by the operator
-  # LB settings in cluster manifests take priority over these settings
-  enable_master_load_balancer: "true"
-  enable_replica_load_balancer: "false"
-  api_port: "8080"
-  ring_log_lines: "100"
-  cluster_history_entries: "1000"
-  pod_terminate_grace_period: 5m
-  pdb_name_format: "postgres-{cluster}-pdb"
-  node_eol_label: "lifecycle-status:pending-decommission"
-  node_readiness_label: ""
-  team_api_role_configuration: "log_statement:all"

manifests/postgres-operator.yaml

@@ -12,15 +12,9 @@ spec:
       serviceAccountName: operator
       containers:
       - name: postgres-operator
-        image: registry.opensource.zalan.do/acid/postgres-operator:0f392c2
+        image: registry.opensource.zalan.do/acid/postgres-operator:4c8dfd7
         imagePullPolicy: IfNotPresent
         env:
-        # uncomment to overwrite a similar setting from operator configmap
-        # if set to the empty string, watch the operator's own namespace
-        # if set to the "*", listen to all namespaces
-        # - name: WATCHED_NAMESPACE
-        #  valueFrom:
-        #    fieldRef:
-        #      fieldPath: metadata.namespace
+        # provided additional ENV vars can overwrite individual config map entries  
         - name: CONFIG_MAP_NAME
           value: "postgres-operator"