From 4aba5faca5209cc798a7b2a2f7c8f2238fa863c2 Mon Sep 17 00:00:00 2001 From: Edward Viaene Date: Wed, 16 Jun 2021 17:21:11 -0400 Subject: [PATCH] bump postgres operator version --- postgres-operator/client-setup.sh | 2 +- postgres-operator/postgres-operator.yml | 360 +++++++++++------------- 2 files changed, 172 insertions(+), 190 deletions(-) diff --git a/postgres-operator/client-setup.sh b/postgres-operator/client-setup.sh index 33d8dac..8a3461a 100755 --- a/postgres-operator/client-setup.sh +++ b/postgres-operator/client-setup.sh @@ -14,7 +14,7 @@ # This script should be run after the operator has been deployed PGO_OPERATOR_NAMESPACE="${PGO_OPERATOR_NAMESPACE:-pgo}" PGO_USER_ADMIN="${PGO_USER_ADMIN:-pgouser-admin}" -PGO_CLIENT_VERSION="${PGO_CLIENT_VERSION:-v4.3.2}" +PGO_CLIENT_VERSION="${PGO_CLIENT_VERSION:-v4.7.0}" PGO_CLIENT_URL="https://github.com/CrunchyData/postgres-operator/releases/download/${PGO_CLIENT_VERSION}" PGO_CMD="${PGO_CMD-kubectl}" diff --git a/postgres-operator/postgres-operator.yml b/postgres-operator/postgres-operator.yml index 7b45d9a..e95da95 100644 --- a/postgres-operator/postgres-operator.yml +++ b/postgres-operator/postgres-operator.yml @@ -1,8 +1,8 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: pgo-deployer-sa - namespace: pgo + name: pgo-deployer-sa + namespace: pgo --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 @@ -30,6 +30,7 @@ rules: resources: - secrets verbs: + - list - get - create - delete @@ -43,6 +44,7 @@ rules: - get - create - delete + - list - apiGroups: - '' resources: @@ -52,14 +54,17 @@ rules: - create - delete - patch + - list - apiGroups: - apps - extensions resources: - deployments + - replicasets verbs: - get - list + - watch - create - delete - apiGroups: @@ -96,6 +101,7 @@ rules: - jobs verbs: - delete + - list - apiGroups: - crunchydata.com resources: @@ -105,201 +111,177 @@ rules: - pgtasks verbs: - delete + - list +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: pgo-deployer-cm + namespace: pgo +data: + values.yaml: |- + # ===================== + # Configuration Options + # More info for these options can be found in the docs + # https://access.crunchydata.com/documentation/postgres-operator/latest/installation/configuration/ + # ===================== + 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_aws_s3_uri_style: "" + backrest_aws_s3_verify_tls: "true" + backrest_gcs_bucket: "" + backrest_gcs_endpoint: "" + backrest_gcs_key_type: "" + 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: "centos8-13.3-4.7.0" + 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" + default_exporter_memory: "24Mi" + delete_operator_namespace: "false" + delete_watched_namespaces: "false" + disable_auto_failover: "false" + disable_fsgroup: "false" + reconcile_rbac: "true" + exporterport: "9187" + metrics: "false" + 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_install: "true" + pgo_client_version: "4.7.0" + 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: "centos8-4.7.0" + 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: "" + scheduler_timeout: "3600" + service_type: "ClusterIP" + sync_replication: "false" + backrest_storage: "default" + backup_storage: "default" + primary_storage: "default" + replica_storage: "default" + pgadmin_storage: "default" + wal_storage: "" + storage1_name: "default" + storage1_access_mode: "ReadWriteOnce" + storage1_size: "1G" + storage1_type: "dynamic" + storage2_name: "hostpathstorage" + 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" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: pgo-deployer-crb + name: pgo-deployer-crb roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: pgo-deployer-cr + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pgo-deployer-cr subjects: -- kind: ServiceAccount - name: pgo-deployer-sa - namespace: pgo + - kind: ServiceAccount + name: pgo-deployer-sa + namespace: pgo --- apiVersion: batch/v1 kind: Job metadata: - name: pgo-deploy - namespace: pgo + name: pgo-deploy + namespace: pgo spec: - backoffLimit: 0 - template: - metadata: - name: pgo-deploy - spec: - serviceAccountName: pgo-deployer-sa - restartPolicy: Never - containers: - - name: pgo-deploy - image: registry.developers.crunchydata.com/crunchydata/pgo-deployer:centos7-4.3.2 - imagePullPolicy: IfNotPresent - env: - - name: ARCHIVE_MODE - value: "true" - - name: ARCHIVE_TIMEOUT - value: "60" - - name: BACKREST - value: "true" - - name: BADGER - value: "false" - - name: CRUNCHY_DEBUG - value: "false" - - name: CREATE_RBAC - value: "true" - - name: CCP_IMAGE_PREFIX - value: "registry.developers.crunchydata.com/crunchydata" - - name: CCP_IMAGE_TAG - value: "centos7-12.3-4.3.2" - - name: DB_PASSWORD_LENGTH - value: "24" - - name: DB_PORT - value: "5432" - - name: DB_REPLICAS - value: "0" - - name: DB_USER - value: "testuser" - - name: DEFAULT_INSTANCE_MEMORY - value: "128Mi" - - name: DEFAULT_PGBACKREST_MEMORY - value: "" - - name: DEFAULT_PGBOUNCER_MEMORY - value: "" - - name: DEPLOY_ACTION - value: "install" - - name: DISABLE_AUTO_FAILOVER - value: "false" - - name: DISABLE_FSGROUP - value: "false" - - name: DYNAMIC_RBAC - value: "false" - - name: EXPORTERPORT - value: "9187" - - name: METRICS - value: "false" - - name: NAMESPACE - value: "pgo" - - name: NAMESPACE_MODE - value: "dynamic" - - name: PGBADGERPORT - value: "10000" - - name: PGO_ADMIN_PASSWORD - value: "password" - - name: PGO_ADMIN_PERMS - value: "*" - - name: PGO_ADMIN_ROLE_NAME - value: "pgoadmin" - - name: PGO_ADMIN_USERNAME - value: "admin" - - name: PGO_CLIENT_VERSION - value: "v4.3.2" - - name: PGO_IMAGE_PREFIX - value: "registry.developers.crunchydata.com/crunchydata" - - name: PGO_IMAGE_TAG - value: "centos7-4.3.2" - - name: PGO_INSTALLATION_NAME - value: "devtest" - - name: PGO_OPERATOR_NAMESPACE - value: "pgo" - - name: SCHEDULER_TIMEOUT - value: "3600" - - name: BACKREST_STORAGE - value: "standard" - - name: BACKUP_STORAGE - value: "standard" - - name: PRIMARY_STORAGE - value: "standard" - - name: REPLICA_STORAGE - value: "standard" - - name: WAL_STORAGE - value: "" - - name: STORAGE1_NAME - value: "standard" - - name: STORAGE1_ACCESS_MODE - value: "ReadWriteMany" - - name: STORAGE1_SIZE - value: "1G" - - name: STORAGE1_TYPE - value: "create" - - name: STORAGE2_NAME - value: "replicastorage" - - name: STORAGE2_ACCESS_MODE - value: "ReadWriteMany" - - name: STORAGE2_SIZE - value: "700M" - - name: STORAGE2_TYPE - value: "create" - - name: STORAGE3_NAME - value: "nfsstorage" - - name: STORAGE3_ACCESS_MODE - value: "ReadWriteMany" - - name: STORAGE3_SIZE - value: "1G" - - name: STORAGE3_TYPE - value: "create" - - name: STORAGE3_SUPPLEMENTAL_GROUPS - value: "65534" - - name: STORAGE4_NAME - value: "nfsstoragered" - - name: STORAGE4_ACCESS_MODE - value: "ReadWriteMany" - - name: STORAGE4_SIZE - value: "1G" - - name: STORAGE4_MATCH_LABEL - value: "crunchyzone=red" - - name: STORAGE4_TYPE - value: "create" - - name: STORAGE4_SUPPLEMENTAL_GROUPS - value: "65534" - - name: STORAGE5_NAME - value: "storageos" - - name: STORAGE5_ACCESS_MODE - value: "ReadWriteOnce" - - name: STORAGE5_SIZE - value: "5Gi" - - name: STORAGE5_TYPE - value: "dynamic" - - name: STORAGE5_CLASS - value: "fast" - - name: STORAGE6_NAME - value: "primarysite" - - name: STORAGE6_ACCESS_MODE - value: "ReadWriteOnce" - - name: STORAGE6_SIZE - value: "4G" - - name: STORAGE6_TYPE - value: "dynamic" - - name: STORAGE6_CLASS - value: "primarysite" - - name: STORAGE7_NAME - value: "alternatesite" - - name: STORAGE7_ACCESS_MODE - value: "ReadWriteOnce" - - name: STORAGE7_SIZE - value: "4G" - - name: STORAGE7_TYPE - value: "dynamic" - - name: STORAGE7_CLASS - value: "alternatesite" - - name: STORAGE8_NAME - value: "gce" - - name: STORAGE8_ACCESS_MODE - value: "ReadWriteOnce" - - name: STORAGE8_SIZE - value: "300M" - - name: STORAGE8_TYPE - value: "dynamic" - - name: STORAGE8_CLASS - value: "standard" - - name: STORAGE9_NAME - value: "rook" - - name: STORAGE9_ACCESS_MODE - value: "ReadWriteOnce" - - name: STORAGE9_SIZE - value: "1Gi" - - name: STORAGE9_TYPE - value: "dynamic" - - name: STORAGE9_CLASS - value: "rook-ceph-block" + backoffLimit: 0 + template: + metadata: + name: pgo-deploy + spec: + serviceAccountName: pgo-deployer-sa + restartPolicy: Never + containers: + - name: pgo-deploy + image: registry.developers.crunchydata.com/crunchydata/pgo-deployer:centos8-4.7.0 + imagePullPolicy: IfNotPresent + env: + - name: DEPLOY_ACTION + value: install + volumeMounts: + - name: deployer-conf + mountPath: "/conf" + volumes: + - name: deployer-conf + configMap: + name: pgo-deployer-cm