From 856e279c36f91f0fe36b03d8d218ce9ab0df20e5 Mon Sep 17 00:00:00 2001 From: Jeff McCoy Date: Wed, 10 Aug 2022 01:45:23 -0500 Subject: [PATCH] remove faulty minio backup from postgres operator --- examples/minio/operator-values.yaml | 4 ++++ .../demo-cluster.yaml} | 2 -- .../postgres-operator/pgadmin/values.yaml | 2 +- .../postgres/operator-ui-values.yaml | 13 ------------ .../postgres/operator-values.yaml | 14 ------------- .../postgres-operator/postgres/operator.yaml | 15 ------------- .../postgres/patch-svc-accounts.yaml | 6 ------ examples/postgres-operator/zarf.yaml | 21 ++++++++----------- 8 files changed, 14 insertions(+), 63 deletions(-) rename examples/postgres-operator/{postgres/db-cluster.yaml => example-db/demo-cluster.yaml} (85%) delete mode 100644 examples/postgres-operator/postgres/operator.yaml delete mode 100644 examples/postgres-operator/postgres/patch-svc-accounts.yaml diff --git a/examples/minio/operator-values.yaml b/examples/minio/operator-values.yaml index 2a4a8b7f9d..f18e5a8a8c 100644 --- a/examples/minio/operator-values.yaml +++ b/examples/minio/operator-values.yaml @@ -4,3 +4,7 @@ operator: cpu: 200m memory: 256Mi ephemeral-storage: 500Mi + env: + # Disable TLS for this demo + - name: MINIO_OPERATOR_TLS_ENABLE + value: "off" diff --git a/examples/postgres-operator/postgres/db-cluster.yaml b/examples/postgres-operator/example-db/demo-cluster.yaml similarity index 85% rename from examples/postgres-operator/postgres/db-cluster.yaml rename to examples/postgres-operator/example-db/demo-cluster.yaml index a70050277e..2672df8cdb 100644 --- a/examples/postgres-operator/postgres/db-cluster.yaml +++ b/examples/postgres-operator/example-db/demo-cluster.yaml @@ -16,8 +16,6 @@ spec: zarf: [] databases: zarf: zarf - enableLogicalBackup: true - logicalBackupSchedule: "*/2 * * * *" resources: requests: cpu: 100m diff --git a/examples/postgres-operator/pgadmin/values.yaml b/examples/postgres-operator/pgadmin/values.yaml index d29da8690c..af4fdb3e72 100644 --- a/examples/postgres-operator/pgadmin/values.yaml +++ b/examples/postgres-operator/pgadmin/values.yaml @@ -11,4 +11,4 @@ resources: memory: "512Mi" env: email: "zarf@example.local" - password: "###ZARF_GIT_AUTH_PUSH###" + password: "###ZARF_VAR_PGADMIN_PASSWORD###" diff --git a/examples/postgres-operator/postgres/operator-ui-values.yaml b/examples/postgres-operator/postgres/operator-ui-values.yaml index 6e9e092c5a..7c68ff3492 100644 --- a/examples/postgres-operator/postgres/operator-ui-values.yaml +++ b/examples/postgres-operator/postgres/operator-ui-values.yaml @@ -14,19 +14,6 @@ envs: targetNamespace: "postgres-operator" teams: - "acid" -extraEnvs: - - name: WALE_S3_ENDPOINT - value: "http+path://minio.minio-operator.svc.cluster.local:80" - - name: AWS_ENDPOINT - value: "http://minio.minio-operator.svc.cluster.local" - - name: SPILO_S3_BACKUP_PREFIX - value: "spilo/" - - name: AWS_ACCESS_KEY_ID - value: "minio" - - name: AWS_SECRET_ACCESS_KEY - value: "minio123" - - name: SPILO_S3_BACKUP_BUCKET - value: "postgres-operator-backups" # We are defining our own Ingress manifest ingress: enabled: false diff --git a/examples/postgres-operator/postgres/operator-values.yaml b/examples/postgres-operator/postgres/operator-values.yaml index 789dec449e..8b1ad54390 100644 --- a/examples/postgres-operator/postgres/operator-values.yaml +++ b/examples/postgres-operator/postgres/operator-values.yaml @@ -1,5 +1,3 @@ -# configGeneral: - # docker_image: registry1.dso.mil/.../spilo-13:2.1-p1 configPostgresPodResources: default_cpu_request: "100m" default_memory_request: "100Mi" @@ -7,18 +5,6 @@ configPostgresPodResources: default_memory_limit: "500Mi" min_cpu_limit: "250m" min_memory_limit: "250Mi" -configAwsOrGcp: - wal_s3_bucket: "postgres-operator-backups" -configLogicalBackup: - # logical_backup_docker_image: "registry1.dso.mil/.../logical-backup:v1.7.0" - logical_backup_s3_endpoint: "http://minio.minio-operator.svc.cluster.local" - logical_backup_s3_access_key_id: "minio" - logical_backup_s3_bucket: "postgres-operator-backups" - logical_backup_s3_secret_access_key : "minio123" - logical_backup_s3_sse: "" - logical_backup_schedule: "*/2 * * * *" -configKubernetes: - pod_environment_configmap: "postgres-operator/postgres-pod-config" configConnectionPooler: connection_pooler_default_cpu_request: "100m" connection_pooler_default_cpu_limit: "1000m" diff --git a/examples/postgres-operator/postgres/operator.yaml b/examples/postgres-operator/postgres/operator.yaml deleted file mode 100644 index 85a873a39b..0000000000 --- a/examples/postgres-operator/postgres/operator.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: postgres-pod-config - namespace: postgres-operator -data: - AWS_ENDPOINT: http://minio.minio-operator.svc.cluster.local - AWS_ACCESS_KEY_ID: minio - AWS_SECRET_ACCESS_KEY: minio123 - BACKUP_NUM_TO_RETAIN: "3" - BACKUP_SCHEDULE: "*/2 * * * *" - USE_WALG_BACKUP: "true" - WALG_DISABLE_S3_SSE: "true" - USE_WALG_RESTORE: "false" - AWS_S3_FORCE_PATH_STYLE: "true" diff --git a/examples/postgres-operator/postgres/patch-svc-accounts.yaml b/examples/postgres-operator/postgres/patch-svc-accounts.yaml deleted file mode 100644 index 20577362b7..0000000000 --- a/examples/postgres-operator/postgres/patch-svc-accounts.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# This will make zarf aware of this SA to do the imagepullsecret patching for it -apiVersion: v1 -kind: ServiceAccount -metadata: - name: postgres-pod - namespace: postgres-operator diff --git a/examples/postgres-operator/zarf.yaml b/examples/postgres-operator/zarf.yaml index 9a568965e5..e28ff9f118 100644 --- a/examples/postgres-operator/zarf.yaml +++ b/examples/postgres-operator/zarf.yaml @@ -4,12 +4,7 @@ metadata: description: "Demo of prod-like Postgres database(s) on an edge cluster" components: - - name: minio - required: true - import: - path: ../minio - - - name: postgres + - name: postgres-operator required: true charts: - name: postgres-operator @@ -25,21 +20,17 @@ components: valuesFiles: - postgres/operator-ui-values.yaml manifests: - - name: postgres-example-config + - name: zarf-connect files: - - postgres/patch-svc-accounts.yaml - - postgres/db-cluster.yaml - - postgres/operator.yaml - postgres/zarf-connect.yaml images: - registry.opensource.zalan.do/acid/postgres-operator-ui:v1.8.2 - registry.opensource.zalan.do/acid/postgres-operator:v1.8.2 - - registry.opensource.zalan.do/acid/logical-backup:v1.8.0 - - registry.opensource.zalan.do/acid/logical-backup:v1.8.2 - registry.opensource.zalan.do/acid/pgbouncer:master-22 - registry.opensource.zalan.do/acid/spilo-14:2.1-p6 - name: pgadmin + required: true charts: - name: pgadmin4 url: https://helm.runix.net @@ -53,3 +44,9 @@ components: - pgadmin/zarf-connect.yaml images: - docker.io/dpage/pgadmin4:6.10 + + - name: example-db + manifests: + - name: example-db + files: + - postgres/demo-cluster.yaml