Skip to content

Commit 5b2be2b

Browse files
Jonathan S. Katzjkatz
authored andcommitted
Revert conversion of installer switches
While with good intentions, this had too many unintended side-effects and will be addressed as part of the next release cycle. This fully reverts 577b387 and 1b037b0 and is a partial revert of cd53751.
1 parent ef92ead commit 5b2be2b

File tree

7 files changed

+122
-122
lines changed

7 files changed

+122
-122
lines changed

installers/ansible/values.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
archive_mode: true
2+
archive_mode: "true"
33
archive_timeout: "60"
44
backrest_aws_s3_bucket: ""
55
backrest_aws_s3_endpoint: ""
@@ -9,13 +9,13 @@ backrest_aws_s3_secret: ""
99
backrest_aws_s3_uri_style: ""
1010
backrest_aws_s3_verify_tls: true
1111
backrest_port: "2022"
12-
badger: false
12+
badger: "false"
1313
ccp_image_prefix: "registry.developers.crunchydata.com/crunchydata"
1414
ccp_image_pull_secret: ""
1515
ccp_image_pull_secret_manifest: ""
1616
ccp_image_tag: "centos7-12.3-4.4.0-rc.1"
17-
create_rbac: true
18-
crunchy_debug: false
17+
create_rbac: "true"
18+
crunchy_debug: "false"
1919
db_name: ""
2020
db_password_age_days: "0"
2121
db_password_length: "24"
@@ -25,38 +25,38 @@ db_user: "testuser"
2525
default_instance_memory: "128Mi"
2626
default_pgbackrest_memory: "48Mi"
2727
default_pgbouncer_memory: "24Mi"
28-
delete_metrics_namespace: false
29-
delete_operator_namespace: false
30-
delete_watched_namespaces: false
31-
disable_auto_failover: false
32-
disable_fsgroup: false
33-
reconcile_rbac: true
28+
delete_metrics_namespace: "false"
29+
delete_operator_namespace: "false"
30+
delete_watched_namespaces: "false"
31+
disable_auto_failover: "false"
32+
disable_fsgroup: "false"
33+
reconcile_rbac: "true"
3434
exporterport: "9187"
3535
grafana_admin_password: ""
3636
grafana_admin_username: "admin"
37-
grafana_install: false
37+
grafana_install: "false"
3838
grafana_storage_access_mode: "ReadWriteOnce"
3939
grafana_storage_class_name: "fast"
4040
grafana_supplemental_groups: "65534"
4141
grafana_volume_size: "1G"
42-
metrics: false
42+
metrics: "false"
4343
metrics_namespace: "pgo"
4444
namespace: "pgo"
4545
namespace_mode: "dynamic"
4646
pgbadgerport: "10000"
47-
pgo_add_os_ca_store: false
47+
pgo_add_os_ca_store: "false"
4848
pgo_admin_password: "examplepassword"
4949
pgo_admin_perms: "*"
5050
pgo_admin_role_name: "pgoadmin"
5151
pgo_admin_username: "admin"
5252
pgo_apiserver_port: "8443"
5353
pgo_apiserver_url: "https://postgres-operator"
5454
pgo_client_cert_secret: "pgo.tls"
55-
pgo_client_container_install: false
55+
pgo_client_container_install: "false"
5656
pgo_client_version: "v4.4.0-rc.1"
57-
pgo_cluster_admin: false
58-
pgo_disable_eventing: false
59-
pgo_disable_tls: false
57+
pgo_cluster_admin: "false"
58+
pgo_disable_eventing: "false"
59+
pgo_disable_tls: "false"
6060
pgo_image_prefix: "registry.developers.crunchydata.com/crunchydata"
6161
pgo_image_pull_secret: ""
6262
pgo_image_pull_secret_manifest: ""
@@ -65,18 +65,18 @@ pgo_installation_name: "devtest"
6565
pgo_noauth_routes: ""
6666
pgo_operator_namespace: "pgo"
6767
pgo_tls_ca_store: ""
68-
pgo_tls_no_verify: false
68+
pgo_tls_no_verify: "false"
6969
pod_anti_affinity: "preferred"
7070
pod_anti_affinity_pgbackrest: ""
7171
pod_anti_affinity_pgbouncer: ""
72-
prometheus_install: false
72+
prometheus_install: "false"
7373
prometheus_storage_access_mode: "ReadWriteOnce"
7474
prometheus_storage_class_name: "fast"
7575
prometheus_supplemental_groups: "65534"
7676
prometheus_volume_size: "1G"
7777
scheduler_timeout: "3600"
7878
service_type: "ClusterIP"
79-
sync_replication: false
79+
sync_replication: "false"
8080
backrest_storage: "hostpathstorage"
8181
backup_storage: "hostpathstorage"
8282
primary_storage: "hostpathstorage"

installers/helm/metrics/templates/values_configmap.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@ metadata:
88
data:
99
values.yaml: |
1010
---
11-
archive_mode: {{ .Values.archive_mode}}
11+
archive_mode: "{{ .Values.archive_mode}}"
1212
archive_timeout: "{{ .Values.archive_timeout}}"
13-
badger: {{ .Values.badger}}
13+
badger: "{{ .Values.badger}}"
1414
ccp_image_prefix: "{{ .Values.ccp_image_prefix}}"
1515
ccp_image_pull_secret: "{{ .Values.ccp_image_pull_secret}}"
1616
ccp_image_pull_secret_manifest: "{{ .Values.ccp_image_pull_secret_manifest}}"
1717
ccp_image_tag: "{{ .Values.ccp_image_tag}}"
18-
create_rbac: {{ .Values.create_rbac}}
19-
crunchy_debug: {{ .Values.crunchy_debug}}
18+
create_rbac: "{{ .Values.create_rbac}}"
19+
crunchy_debug: "{{ .Values.crunchy_debug}}"
2020
db_password_age_days: "{{ .Values.db_password_age_days}}"
2121
db_password_length: "{{ .Values.db_password_length}}"
2222
db_port: "{{ .Values.db_port}}"
2323
db_replicas: "{{ .Values.db_replicas}}"
2424
db_user: "{{ .Values.db_user}}"
25-
delete_metrics_namespace: {{ .Values.delete_metrics_namespace}}
26-
disable_auto_failover: {{ .Values.disable_auto_failover}}
27-
disable_fsgroup: {{ .Values.disable_fsgroup}}
28-
reconcile_rbac: {{ .Values.reconcile_rbac}}
25+
delete_metrics_namespace: "{{ .Values.delete_metrics_namespace}}"
26+
disable_auto_failover: "{{ .Values.disable_auto_failover}}"
27+
disable_fsgroup: "{{ .Values.disable_fsgroup}}"
28+
reconcile_rbac: "{{ .Values.reconcile_rbac}}"
2929
exporterport: "{{ .Values.exporterport}}"
3030
grafana_admin_password: "{{ .Values.grafana_admin_password}}"
3131
grafana_admin_username: "{{ .Values.grafana_admin_username}}"
32-
grafana_install: {{ .Values.grafana_install}}
32+
grafana_install: "{{ .Values.grafana_install}}"
3333
grafana_storage_access_mode: "{{ .Values.grafana_storage_access_mode}}"
3434
grafana_storage_class_name: "{{ .Values.grafana_storage_class_name}}"
3535
grafana_supplemental_groups: "{{ .Values.grafana_supplemental_groups}}"
3636
grafana_volume_size: "{{ .Values.grafana_volume_size}}"
37-
metrics: {{ .Values.metrics}}
37+
metrics: "{{ .Values.metrics}}"
3838
metrics_namespace: "{{ .Values.metrics_namespace}}"
3939
namespace_mode: "{{ .Values.namespace_mode}}"
4040
pgbadgerport: "{{ .Values.pgbadgerport}}"
@@ -49,7 +49,7 @@ data:
4949
pgo_image_tag: "{{ .Values.pgo_image_tag}}"
5050
pgo_installation_name: "{{ .Values.pgo_installation_name}}"
5151
pgo_operator_namespace: "{{ .Values.pgo_operator_namespace}}"
52-
prometheus_install: {{ .Values.prometheus_install}}
52+
prometheus_install: "{{ .Values.prometheus_install}}"
5353
prometheus_storage_access_mode: "{{ .Values.prometheus_storage_access_mode}}"
5454
prometheus_storage_class_name: "{{ .Values.prometheus_storage_class_name}}"
5555
prometheus_supplemental_groups: "{{ .Values.prometheus_supplemental_groups}}"

installers/helm/metrics/values.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,32 @@ serviceAccount:
2323
# More info for these options can be found in the docs
2424
# https://crunchydata.github.io/postgres-operator/latest/installation/configuration/
2525
# =====================
26-
archive_mode: true
26+
archive_mode: "true"
2727
archive_timeout: "60"
28-
badger: false
28+
badger: "false"
2929
ccp_image_prefix: "registry.developers.crunchydata.com/crunchydata"
3030
ccp_image_pull_secret: ""
3131
ccp_image_pull_secret_manifest: ""
3232
ccp_image_tag: "centos7-12.3-4.4.0-rc.1"
33-
create_rbac: true
34-
crunchy_debug: false
33+
create_rbac: "true"
34+
crunchy_debug: "false"
3535
db_password_length: "24"
3636
db_port: "5432"
3737
db_replicas: "0"
3838
db_user: "testuser"
39-
delete_metrics_namespace: false
40-
disable_auto_failover: false
41-
disable_fsgroup: false
42-
reconcile_rbac: true
39+
delete_metrics_namespace: "false"
40+
disable_auto_failover: "false"
41+
disable_fsgroup: "false"
42+
reconcile_rbac: "true"
4343
exporterport: "9187"
4444
grafana_admin_password: ""
4545
grafana_admin_username: "admin"
46-
grafana_install: false
46+
grafana_install: "false"
4747
grafana_storage_access_mode: "ReadWriteOnce"
4848
grafana_storage_class_name: "fast"
4949
grafana_supplemental_groups: "65534"
5050
grafana_volume_size: "1G"
51-
metrics: false
51+
metrics: "false"
5252
metrics_namespace: "pgo"
5353
namespace_mode: "dynamic"
5454
pgbadgerport: "10000"
@@ -63,7 +63,7 @@ pgo_image_pull_secret_manifest: ""
6363
pgo_image_tag: "centos7-4.4.0-rc.1"
6464
pgo_installation_name: "devtest"
6565
pgo_operator_namespace: "pgo"
66-
prometheus_install: false
66+
prometheus_install: "false"
6767
prometheus_storage_access_mode: "ReadWriteOnce"
6868
prometheus_storage_class_name: "fast"
6969
prometheus_supplemental_groups: "65534"

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ metadata:
88
data:
99
values.yaml: |
1010
---
11-
archive_mode: {{ .Values.archive_mode}}
11+
archive_mode: "{{ .Values.archive_mode}}"
1212
archive_timeout: "{{ .Values.archive_timeout}}"
1313
backrest_aws_s3_bucket: "{{ .Values.backrest_aws_s3_bucket}}"
1414
backrest_aws_s3_endpoint: "{{ .Values.backrest_aws_s3_endpoint}}"
1515
backrest_aws_s3_key: "{{ .Values.backrest_aws_s3_key}}"
1616
backrest_aws_s3_region: "{{ .Values.backrest_aws_s3_region}}"
1717
backrest_aws_s3_secret: "{{ .Values.backrest_aws_s3_secret}}"
1818
backrest_aws_s3_uri_style: "{{ .Values.backrest_aws_s3_uri_style }}"
19-
backrest_aws_s3_verify_tls: {{ .Values.backrest_aws_s3_verify_tls }}
19+
backrest_aws_s3_verify_tls: "{{ .Values.backrest_aws_s3_verify_tls }}"
2020
backrest_port: "{{ .Values.backrest_port}}"
21-
badger: {{ .Values.badger}}
21+
badger: "{{ .Values.badger}}"
2222
ccp_image_prefix: "{{ .Values.ccp_image_prefix}}"
2323
ccp_image_pull_secret: "{{ .Values.ccp_image_pull_secret}}"
2424
ccp_image_pull_secret_manifest: "{{ .Values.ccp_image_pull_secret_manifest}}"
2525
ccp_image_tag: "{{ .Values.ccp_image_tag}}"
26-
create_rbac: {{ .Values.create_rbac}}
27-
crunchy_debug: {{ .Values.crunchy_debug}}
26+
create_rbac: "{{ .Values.create_rbac}}"
27+
crunchy_debug: "{{ .Values.crunchy_debug}}"
2828
db_name: "{{ .Values.db_name}}"
2929
db_password_age_days: "{{ .Values.db_password_age_days}}"
3030
db_password_length: "{{ .Values.db_password_length}}"
@@ -34,30 +34,30 @@ data:
3434
default_instance_memory: "{{ .Values.default_instance_memory}}"
3535
default_pgbackrest_memory: "{{ .Values.default_pgbackrest_memory}}"
3636
default_pgbouncer_memory: "{{ .Values.default_pgbouncer_memory}}"
37-
delete_metrics_namespace: {{ .Values.delete_metrics_namespace}}
38-
delete_operator_namespace: {{ .Values.delete_operator_namespace}}
39-
delete_watched_namespaces: {{ .Values.delete_watched_namespaces}}
40-
disable_auto_failover: {{ .Values.disable_auto_failover}}
41-
disable_fsgroup: {{ .Values.disable_fsgroup}}
42-
reconcile_rbac: {{ .Values.reconcile_rbac}}
37+
delete_metrics_namespace: "{{ .Values.delete_metrics_namespace}}"
38+
delete_operator_namespace: "{{ .Values.delete_operator_namespace}}"
39+
delete_watched_namespaces: "{{ .Values.delete_watched_namespaces}}"
40+
disable_auto_failover: "{{ .Values.disable_auto_failover}}"
41+
disable_fsgroup: "{{ .Values.disable_fsgroup}}"
42+
reconcile_rbac: "{{ .Values.reconcile_rbac}}"
4343
exporterport: "{{ .Values.exporterport}}"
44-
metrics: {{ .Values.metrics}}
44+
metrics: "{{ .Values.metrics}}"
4545
namespace: "{{ .Values.namespace}}"
4646
namespace_mode: "{{ .Values.namespace_mode}}"
4747
pgbadgerport: "{{ .Values.pgbadgerport}}"
48-
pgo_add_os_ca_store: {{ .Values.pgo_add_os_ca_store}}
48+
pgo_add_os_ca_store: "{{ .Values.pgo_add_os_ca_store}}"
4949
pgo_admin_password: "{{ .Values.pgo_admin_password}}"
5050
pgo_admin_perms: "{{ .Values.pgo_admin_perms}}"
5151
pgo_admin_role_name: "{{ .Values.pgo_admin_role_name}}"
5252
pgo_admin_username: "{{ .Values.pgo_admin_username}}"
5353
pgo_apiserver_port: "{{ .Values.pgo_apiserver_port}}"
5454
pgo_apiserver_url: "{{ .Values.pgo_apiserver_url}}"
5555
pgo_client_cert_secret: "{{ .Values.pgo_client_cert_secret}}"
56-
pgo_client_container_install: {{ .Values.pgo_client_container_install}}
56+
pgo_client_container_install: "{{ .Values.pgo_client_container_install}}"
5757
pgo_client_version: "{{ .Values.pgo_client_version}}"
58-
pgo_cluster_admin: {{ .Values.pgo_cluster_admin}}
59-
pgo_disable_eventing: {{ .Values.pgo_disable_eventing}}
60-
pgo_disable_tls: {{ .Values.pgo_disable_tls}}
58+
pgo_cluster_admin: "{{ .Values.pgo_cluster_admin}}"
59+
pgo_disable_eventing: "{{ .Values.pgo_disable_eventing}}"
60+
pgo_disable_tls: "{{ .Values.pgo_disable_tls}}"
6161
pgo_image_prefix: "{{ .Values.pgo_image_prefix}}"
6262
pgo_image_pull_secret: "{{ .Values.pgo_image_pull_secret}}"
6363
pgo_image_pull_secret_manifest: "{{ .Values.pgo_image_pull_secret_manifest}}"
@@ -66,13 +66,13 @@ data:
6666
pgo_noauth_routes: "{{ .Values.pgo_noauth_routes}}"
6767
pgo_operator_namespace: "{{ .Values.pgo_operator_namespace}}"
6868
pgo_tls_ca_store: "{{ .Values.pgo_tls_ca_store}}"
69-
pgo_tls_no_verify: {{ .Values.pgo_tls_no_verify}}
69+
pgo_tls_no_verify: "{{ .Values.pgo_tls_no_verify}}"
7070
pod_anti_affinity: "{{ .Values.pod_anti_affinity}}"
7171
pod_anti_affinity_pgbackrest: "{{ .Values.pod_anti_affinity_pgbackrest}}"
7272
pod_anti_affinity_pgbouncer: "{{ .Values.pod_anti_affinity_pgbouncer}}"
7373
scheduler_timeout: "{{ .Values.scheduler_timeout}}"
7474
service_type: "{{ .Values.service_type}}"
75-
sync_replication: {{ .Values.sync_replication}}
75+
sync_replication: "{{ .Values.sync_replication}}"
7676
backrest_storage: "{{ .Values.backrest_storage}}"
7777
backup_storage: "{{ .Values.backup_storage}}"
7878
primary_storage: "{{ .Values.primary_storage}}"

installers/helm/postgres-operator/values.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ serviceAccount:
2323
# More info for these options can be found in the docs
2424
# https://crunchydata.github.io/postgres-operator/latest/installation/configuration/
2525
# =====================
26-
archive_mode: true
26+
archive_mode: "true"
2727
archive_timeout: "60"
2828
backrest_aws_s3_bucket: ""
2929
backrest_aws_s3_endpoint: ""
@@ -33,13 +33,13 @@ backrest_aws_s3_secret: ""
3333
backrest_aws_s3_uri_style: ""
3434
backrest_aws_s3_verify_tls: true
3535
backrest_port: "2022"
36-
badger: false
36+
badger: "false"
3737
ccp_image_prefix: "registry.developers.crunchydata.com/crunchydata"
3838
ccp_image_pull_secret: ""
3939
ccp_image_pull_secret_manifest: ""
4040
ccp_image_tag: "centos7-12.3-4.4.0-rc.1"
41-
create_rbac: true
42-
crunchy_debug: false
41+
create_rbac: "true"
42+
crunchy_debug: "false"
4343
db_name: ""
4444
db_password_age_days: "0"
4545
db_password_length: "24"
@@ -49,30 +49,30 @@ db_user: "testuser"
4949
default_instance_memory: "128Mi"
5050
default_pgbackrest_memory: "48Mi"
5151
default_pgbouncer_memory: "24Mi"
52-
delete_metrics_namespace: false
53-
delete_operator_namespace: false
54-
delete_watched_namespaces: false
55-
disable_auto_failover: false
56-
disable_fsgroup: false
57-
reconcile_rbac: true
52+
delete_metrics_namespace: "false"
53+
delete_operator_namespace: "false"
54+
delete_watched_namespaces: "false"
55+
disable_auto_failover: "false"
56+
disable_fsgroup: "false"
57+
reconcile_rbac: "true"
5858
exporterport: "9187"
59-
metrics: false
59+
metrics: "false"
6060
namespace: "pgo"
6161
namespace_mode: "dynamic"
6262
pgbadgerport: "10000"
63-
pgo_add_os_ca_store: false
63+
pgo_add_os_ca_store: "false"
6464
pgo_admin_password: "examplepassword"
6565
pgo_admin_perms: "*"
6666
pgo_admin_role_name: "pgoadmin"
6767
pgo_admin_username: "admin"
6868
pgo_apiserver_port: "8443"
6969
pgo_apiserver_url: "https://postgres-operator"
7070
pgo_client_cert_secret: "pgo.tls"
71-
pgo_client_container_install: false
71+
pgo_client_container_install: "false"
7272
pgo_client_version: "4.4.0-rc.1"
73-
pgo_cluster_admin: false
74-
pgo_disable_eventing: false
75-
pgo_disable_tls: false
73+
pgo_cluster_admin: "false"
74+
pgo_disable_eventing: "false"
75+
pgo_disable_tls: "false"
7676
pgo_image_prefix: "registry.developers.crunchydata.com/crunchydata"
7777
pgo_image_pull_secret: ""
7878
pgo_image_pull_secret_manifest: ""
@@ -81,13 +81,13 @@ pgo_installation_name: "devtest"
8181
pgo_noauth_routes: ""
8282
pgo_operator_namespace: "pgo"
8383
pgo_tls_ca_store: ""
84-
pgo_tls_no_verify: false
84+
pgo_tls_no_verify: "false"
8585
pod_anti_affinity: "preferred"
8686
pod_anti_affinity_pgbackrest: ""
8787
pod_anti_affinity_pgbouncer: ""
8888
scheduler_timeout: "3600"
8989
service_type: "ClusterIP"
90-
sync_replication: false
90+
sync_replication: "false"
9191
backrest_storage: "hostpathstorage"
9292
backup_storage: "hostpathstorage"
9393
primary_storage: "hostpathstorage"
@@ -136,4 +136,4 @@ storage9_name: "rook"
136136
storage9_access_mode: "ReadWriteOnce"
137137
storage9_size: "1Gi"
138138
storage9_type: "dynamic"
139-
storage9_class: "rook-ceph-block"
139+
storage9_class: "rook-ceph-block"

0 commit comments

Comments
 (0)