Updates configuration files to separate metrics options

This commit reduces the overlap between the values.yaml in the postgres-operator
and metrics helm charts. The metrics options have been removed from the
postgres-operator values.yaml and the metrics values.yaml file has been updated
to only include metrics options or options that are required to run.

Author: jmckulk

docs/content/installation/other/helm.md

@@ -179,10 +179,10 @@ pgo-apiserver version 4.4.0-beta.1
 ## Metrics Chart
 
 The PostgreSQL Operator metrics infrastructure can be installed using a separate
-Helm chart. This chart can install or uninstall metrics in a namespace where
-the operator is currently running. The metrics installer runs similarly to the
-`postgres-operator` chart by creating the ServiceAccount, RBAC resources,
-and ConfigMap that are needed to run the install job.
+Helm chart. This chart can install or uninstall the Grafana and Prometheus
+deployments that are part of the metrics stack. The metrics installer runs
+similarly to the `postgres-operator` chart by creating the ServiceAccount, RBAC
+resources, and ConfigMap that are needed to run the install job.
 
 The `metrics` Helm chart is available in the [Helm](https://github.com/CrunchyData/postgres-operator/tree/master/installers/helm)
 directory in the PostgreSQL Operator repository.

installers/helm/metrics/templates/values_configmap.yaml

@@ -10,31 +10,19 @@ data:
     ---
     archive_mode: "{{ .Values.archive_mode}}"
     archive_timeout: "{{ .Values.archive_timeout}}"
-    backrest_aws_s3_bucket: "{{ .Values.backrest_aws_s3_bucket}}"
-    backrest_aws_s3_endpoint: "{{ .Values.backrest_aws_s3_endpoint}}"
-    backrest_aws_s3_key: "{{ .Values.backrest_aws_s3_key}}"
-    backrest_aws_s3_region: "{{ .Values.backrest_aws_s3_region}}"
-    backrest_aws_s3_secret: "{{ .Values.backrest_aws_s3_secret}}"
-    backrest_port: "{{ .Values.backrest_port}}"
     badger: "{{ .Values.badger}}"
     ccp_image_prefix: "{{ .Values.ccp_image_prefix}}"
     ccp_image_pull_secret: "{{ .Values.ccp_image_pull_secret}}"
     ccp_image_pull_secret_manifest: "{{ .Values.ccp_image_pull_secret_manifest}}"
     ccp_image_tag: "{{ .Values.ccp_image_tag}}"
     create_rbac: "{{ .Values.create_rbac}}"
     crunchy_debug: "{{ .Values.crunchy_debug}}"
-    db_name: "{{ .Values.db_name}}"
     db_password_age_days: "{{ .Values.db_password_age_days}}"
     db_password_length: "{{ .Values.db_password_length}}"
     db_port: "{{ .Values.db_port}}"
     db_replicas: "{{ .Values.db_replicas}}"
     db_user: "{{ .Values.db_user}}"
-    default_instance_memory: "{{ .Values.default_instance_memory}}"
-    default_pgbackrest_memory: "{{ .Values.default_pgbackrest_memory}}"
-    default_pgbouncer_memory: "{{ .Values.default_pgbouncer_memory}}"
     delete_metrics_namespace: "{{ .Values.delete_metrics_namespace}}"
-    delete_operator_namespace: "{{ .Values.delete_operator_namespace}}"
-    delete_watched_namespaces: "{{ .Values.delete_watched_namespaces}}"
     disable_auto_failover: "{{ .Values.disable_auto_failover}}"
     disable_fsgroup: "{{ .Values.disable_fsgroup}}"
     dynamic_rbac: "{{ .Values.dynamic_rbac}}"
@@ -48,88 +36,26 @@ data:
     grafana_volume_size: "{{ .Values.grafana_volume_size}}"
     metrics: "{{ .Values.metrics}}"
     metrics_namespace: "{{ .Values.metrics_namespace}}"
-    namespace: "{{ .Values.namespace}}"
     namespace_mode: "{{ .Values.namespace_mode}}"
     pgbadgerport: "{{ .Values.pgbadgerport}}"
-    pgo_add_os_ca_store: "{{ .Values.pgo_add_os_ca_store}}"
     pgo_admin_password: "{{ .Values.pgo_admin_password}}"
     pgo_admin_perms: "{{ .Values.pgo_admin_perms}}"
     pgo_admin_role_name: "{{ .Values.pgo_admin_role_name}}"
     pgo_admin_username: "{{ .Values.pgo_admin_username}}"
-    pgo_apiserver_port: "{{ .Values.pgo_apiserver_port}}"
-    pgo_apiserver_url: "{{ .Values.pgo_apiserver_url}}"
-    pgo_client_cert_secret: "{{ .Values.pgo_client_cert_secret}}"
-    pgo_client_container_install: "{{ .Values.pgo_client_container_install}}"
     pgo_client_version: "{{ .Values.pgo_client_version}}"
-    pgo_cluster_admin: "{{ .Values.pgo_cluster_admin}}"
-    pgo_disable_eventing: "{{ .Values.pgo_disable_eventing}}"
-    pgo_disable_tls: "{{ .Values.pgo_disable_tls}}"
     pgo_image_prefix: "{{ .Values.pgo_image_prefix}}"
     pgo_image_pull_secret: "{{ .Values.pgo_image_pull_secret}}"
     pgo_image_pull_secret_manifest: "{{ .Values.pgo_image_pull_secret_manifest}}"
     pgo_image_tag: "{{ .Values.pgo_image_tag}}"
     pgo_installation_name: "{{ .Values.pgo_installation_name}}"
-    pgo_noauth_routes: "{{ .Values.pgo_noauth_routes}}"
     pgo_operator_namespace: "{{ .Values.pgo_operator_namespace}}"
-    pgo_tls_ca_store: "{{ .Values.pgo_tls_ca_store}}"
-    pgo_tls_no_verify: "{{ .Values.pgo_tls_no_verify}}"
-    pod_anti_affinity: "{{ .Values.pod_anti_affinity}}"
-    pod_anti_affinity_pgbackrest: "{{ .Values.pod_anti_affinity_pgbackrest}}"
-    pod_anti_affinity_pgbouncer: "{{ .Values.pod_anti_affinity_pgbouncer}}"
     prometheus_install: "{{ .Values.prometheus_install}}"
     prometheus_storage_access_mode: "{{ .Values.prometheus_storage_access_mode}}"
     prometheus_storage_class_name: "{{ .Values.prometheus_storage_class_name}}"
     prometheus_supplemental_groups: "{{ .Values.prometheus_supplemental_groups}}"
     prometheus_volume_size: "{{ .Values.prometheus_volume_size}}"
     scheduler_timeout: "{{ .Values.scheduler_timeout}}"
-    service_type: "{{ .Values.service_type}}"
-    sync_replication: "{{ .Values.sync_replication}}"
     backrest_storage: "{{ .Values.backrest_storage}}"
     backup_storage: "{{ .Values.backup_storage}}"
     primary_storage: "{{ .Values.primary_storage}}"
-    replica_storage: "{{ .Values.replica_storage}}"
-    wal_storage: "{{ .Values.wal_storage}}"
-    storage1_name: "{{ .Values.storage1_name}}"
-    storage1_access_mode: "{{ .Values.storage1_access_mode}}"
-    storage1_size: "{{ .Values.storage1_size}}"
-    storage1_type: "{{ .Values.storage1_type}}"
-    storage2_name: "{{ .Values.storage2_name}}"
-    storage2_access_mode: "{{ .Values.storage2_access_mode}}"
-    storage2_size: "{{ .Values.storage2_size}}"
-    storage2_type: "{{ .Values.storage2_type}}"
-    storage3_name: "{{ .Values.storage3_name}}"
-    storage3_access_mode: "{{ .Values.storage3_access_mode}}"
-    storage3_size: "{{ .Values.storage3_size}}"
-    storage3_type: "{{ .Values.storage3_type}}"
-    storage3_supplemental_groups: "{{ .Values.storage3_supplemental_groups}}"
-    storage4_name: "{{ .Values.storage4_name}}"
-    storage4_access_mode: "{{ .Values.storage4_access_mode}}"
-    storage4_size: "{{ .Values.storage4_size}}"
-    storage4_match_labels: "{{ .Values.storage4_match_labels}}"
-    storage4_type: "{{ .Values.storage4_type}}"
-    storage4_supplemental_groups: "{{ .Values.storage4_supplemental_groups}}"
-    storage5_name: "{{ .Values.storage5_name}}"
-    storage5_access_mode: "{{ .Values.storage5_access_mode}}"
-    storage5_size: "{{ .Values.storage5_size}}"
-    storage5_type: "{{ .Values.storage5_type}}"
-    storage5_class: "{{ .Values.storage5_class}}"
-    storage6_name: "{{ .Values.storage6_name}}"
-    storage6_access_mode: "{{ .Values.storage6_access_mode}}"
-    storage6_size: "{{ .Values.storage6_size}}"
-    storage6_type: "{{ .Values.storage6_type}}"
-    storage6_class: "{{ .Values.storage6_class}}"
-    storage7_name: "{{ .Values.storage7_name}}"
-    storage7_access_mode: "{{ .Values.storage7_access_mode}}"
-    storage7_size: "{{ .Values.storage7_size}}"
-    storage7_type: "{{ .Values.storage7_type}}"
-    storage7_class: "{{ .Values.storage7_class}}"
-    storage8_name: "{{ .Values.storage8_name}}"
-    storage8_access_mode: "{{ .Values.storage8_access_mode}}"
-    storage8_size: "{{ .Values.storage8_size}}"
-    storage8_type: "{{ .Values.storage8_type}}"
-    storage8_class: "{{ .Values.storage8_class}}"
-    storage9_name: "{{ .Values.storage9_name}}"
-    storage9_access_mode: "{{ .Values.storage9_access_mode}}"
-    storage9_size: "{{ .Values.storage9_size}}"
-    storage9_type: "{{ .Values.storage9_type}}"
-    storage9_class: "{{ .Values.storage9_class}}"
+    replica_storage: "{{ .Values.replica_storage}}"

installers/helm/metrics/values.yaml

@@ -23,31 +23,18 @@ serviceAccount:
 # =====================
 archive_mode: true
 archive_timeout: "60"
-backrest_aws_s3_bucket: ""
-backrest_aws_s3_endpoint: ""
-backrest_aws_s3_key: ""
-backrest_aws_s3_region: ""
-backrest_aws_s3_secret: ""
-backrest_port: "2022"
 badger: false
 ccp_image_prefix: "registry.developers.crunchydata.com/crunchydata"
 ccp_image_pull_secret: ""
 ccp_image_pull_secret_manifest: ""
 ccp_image_tag: "centos7-12.3-4.4.0-beta.1"
 create_rbac: true
 crunchy_debug: false
-db_name: ""
-db_password_age_days: "0"
 db_password_length: "24"
 db_port: "5432"
 db_replicas: "0"
 db_user: "testuser"
-default_instance_memory: "128Mi"
-default_pgbackrest_memory: "48Mi"
-default_pgbouncer_memory: "24Mi"
 delete_metrics_namespace: false
-delete_operator_namespace: false
-delete_watched_namespaces: false
 disable_auto_failover: false
 disable_fsgroup: false
 dynamic_rbac: false
@@ -61,88 +48,26 @@ grafana_supplemental_groups: "65534"
 grafana_volume_size: "1G"
 metrics: false
 metrics_namespace: "pgo"
-namespace: "pgo"
 namespace_mode: "dynamic"
 pgbadgerport: "10000"
-pgo_add_os_ca_store: false
 pgo_admin_password: "examplepassword"
 pgo_admin_perms: "*"
 pgo_admin_role_name: "pgoadmin"
 pgo_admin_username: "admin"
-pgo_apiserver_port: "8443"
-pgo_apiserver_url: "https://postgres-operator"
-pgo_client_cert_secret: "pgo.tls"
-pgo_client_container_install: false
 pgo_client_version: "4.4.0-beta.1"
-pgo_cluster_admin: false
-pgo_disable_eventing: false
-pgo_disable_tls: false
 pgo_image_prefix: "registry.developers.crunchydata.com/crunchydata"
 pgo_image_pull_secret: ""
 pgo_image_pull_secret_manifest: ""
 pgo_image_tag: "centos7-4.4.0-beta.1"
 pgo_installation_name: "devtest"
-pgo_noauth_routes: ""
 pgo_operator_namespace: "pgo"
-pgo_tls_ca_store: ""
-pgo_tls_no_verify: false
-pod_anti_affinity: "preferred"
-pod_anti_affinity_pgbackrest: ""
-pod_anti_affinity_pgbouncer: ""
 prometheus_install: false
 prometheus_storage_access_mode: "ReadWriteOnce"
 prometheus_storage_class_name: "fast"
 prometheus_supplemental_groups: "65534"
 prometheus_volume_size: "1G"
 scheduler_timeout: "3600"
-service_type: "ClusterIP"
-sync_replication: false
 backrest_storage: "hostpathstorage"
 backup_storage: "hostpathstorage"
 primary_storage: "hostpathstorage"
 replica_storage: "hostpathstorage"
-wal_storage: ""
-storage1_name: "hostpathstorage"
-storage1_access_mode: "ReadWriteMany"
-storage1_size: "1G"
-storage1_type: "create"
-storage2_name: "replicastorage"
-storage2_access_mode: "ReadWriteMany"
-storage2_size: "1G"
-storage2_type: "create"
-storage3_name: "nfsstorage"
-storage3_access_mode: "ReadWriteMany"
-storage3_size: "1G"
-storage3_type: "create"
-storage3_supplemental_groups: "65534"
-storage4_name: "nfsstoragered"
-storage4_access_mode: "ReadWriteMany"
-storage4_size: "1G"
-storage4_match_labels: "crunchyzone=red"
-storage4_type: "create"
-storage4_supplemental_groups: "65534"
-storage5_name: "storageos"
-storage5_access_mode: "ReadWriteOnce"
-storage5_size: "5Gi"
-storage5_type: "dynamic"
-storage5_class: "fast"
-storage6_name: "primarysite"
-storage6_access_mode: "ReadWriteOnce"
-storage6_size: "4G"
-storage6_type: "dynamic"
-storage6_class: "primarysite"
-storage7_name: "alternatesite"
-storage7_access_mode: "ReadWriteOnce"
-storage7_size: "4G"
-storage7_type: "dynamic"
-storage7_class: "alternatesite"
-storage8_name: "gce"
-storage8_access_mode: "ReadWriteOnce"
-storage8_size: "300M"
-storage8_type: "dynamic"
-storage8_class: "standard"
-storage9_name: "rook"
-storage9_access_mode: "ReadWriteOnce"
-storage9_size: "1Gi"
-storage9_type: "dynamic"
-storage9_class: "rook-ceph-block"    

installers/helm/postgres-operator/templates/values_configmap.yaml

@@ -39,15 +39,7 @@ data:
     disable_fsgroup: "{{ .Values.disable_fsgroup}}"
     dynamic_rbac: "{{ .Values.dynamic_rbac}}"
     exporterport: "{{ .Values.exporterport}}"
-    grafana_admin_password: "{{ .Values.grafana_admin_password}}"
-    grafana_admin_username: "{{ .Values.grafana_admin_username}}"
-    grafana_install: "{{ .Values.grafana_install}}"
-    grafana_storage_access_mode: "{{ .Values.grafana_storage_access_mode}}"
-    grafana_storage_class_name: "{{ .Values.grafana_storage_class_name}}"
-    grafana_supplemental_groups: "{{ .Values.grafana_supplemental_groups}}"
-    grafana_volume_size: "{{ .Values.grafana_volume_size}}"
     metrics: "{{ .Values.metrics}}"
-    metrics_namespace: "{{ .Values.metrics_namespace}}"
     namespace: "{{ .Values.namespace}}"
     namespace_mode: "{{ .Values.namespace_mode}}"
     pgbadgerport: "{{ .Values.pgbadgerport}}"
@@ -76,11 +68,6 @@ data:
     pod_anti_affinity: "{{ .Values.pod_anti_affinity}}"
     pod_anti_affinity_pgbackrest: "{{ .Values.pod_anti_affinity_pgbackrest}}"
     pod_anti_affinity_pgbouncer: "{{ .Values.pod_anti_affinity_pgbouncer}}"
-    prometheus_install: "{{ .Values.prometheus_install}}"
-    prometheus_storage_access_mode: "{{ .Values.prometheus_storage_access_mode}}"
-    prometheus_storage_class_name: "{{ .Values.prometheus_storage_class_name}}"
-    prometheus_supplemental_groups: "{{ .Values.prometheus_supplemental_groups}}"
-    prometheus_volume_size: "{{ .Values.prometheus_volume_size}}"
     scheduler_timeout: "{{ .Values.scheduler_timeout}}"
     service_type: "{{ .Values.service_type}}"
     sync_replication: "{{ .Values.sync_replication}}"

installers/helm/postgres-operator/values.yaml

@@ -52,15 +52,7 @@ disable_auto_failover: "false"
 disable_fsgroup: "false"
 dynamic_rbac: "false"
 exporterport: "9187"
-grafana_admin_password: ""
-grafana_admin_username: "admin"
-grafana_install: "false"
-grafana_storage_access_mode: "ReadWriteOnce"
-grafana_storage_class_name: "fast"
-grafana_supplemental_groups: "65534"
-grafana_volume_size: "1G"
 metrics: "false"
-metrics_namespace: "pgo"
 namespace: "pgo"
 namespace_mode: "dynamic"
 pgbadgerport: "10000"
@@ -89,11 +81,6 @@ pgo_tls_no_verify: "false"
 pod_anti_affinity: "preferred"
 pod_anti_affinity_pgbackrest: ""
 pod_anti_affinity_pgbouncer: ""
-prometheus_install: "false"
-prometheus_storage_access_mode: "ReadWriteOnce"
-prometheus_storage_class_name: "fast"
-prometheus_supplemental_groups: "65534"
-prometheus_volume_size: "1G"
 scheduler_timeout: "3600"
 service_type: "ClusterIP"
 sync_replication: "false"