Skip to content

Commit

Permalink
remove faulty minio backup from postgres operator
Browse files Browse the repository at this point in the history
  • Loading branch information
jeff-mccoy committed Aug 10, 2022
1 parent c528683 commit 856e279
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 63 deletions.
4 changes: 4 additions & 0 deletions examples/minio/operator-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ spec:
zarf: []
databases:
zarf: zarf
enableLogicalBackup: true
logicalBackupSchedule: "*/2 * * * *"
resources:
requests:
cpu: 100m
Expand Down
2 changes: 1 addition & 1 deletion examples/postgres-operator/pgadmin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ resources:
memory: "512Mi"
env:
email: "[email protected]"
password: "###ZARF_GIT_AUTH_PUSH###"
password: "###ZARF_VAR_PGADMIN_PASSWORD###"
13 changes: 0 additions & 13 deletions examples/postgres-operator/postgres/operator-ui-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 0 additions & 14 deletions examples/postgres-operator/postgres/operator-values.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
# configGeneral:
# docker_image: registry1.dso.mil/.../spilo-13:2.1-p1
configPostgresPodResources:
default_cpu_request: "100m"
default_memory_request: "100Mi"
default_cpu_limit: "500m"
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"
Expand Down
15 changes: 0 additions & 15 deletions examples/postgres-operator/postgres/operator.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions examples/postgres-operator/postgres/patch-svc-accounts.yaml

This file was deleted.

21 changes: 9 additions & 12 deletions examples/postgres-operator/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

0 comments on commit 856e279

Please sign in to comment.