diff --git a/kubernetes/apps/database/crunchy-postgres/operator/kustomization.yaml b/kubernetes/apps/database/crunchy-postgres/operator/kustomization.yaml index 77d34c3..0e79a58 100644 --- a/kubernetes/apps/database/crunchy-postgres/operator/kustomization.yaml +++ b/kubernetes/apps/database/crunchy-postgres/operator/kustomization.yaml @@ -5,3 +5,4 @@ kind: Kustomization namespace: database resources: - ./helmrelease.yaml + - ./objectbucketclaim.yaml diff --git a/kubernetes/apps/peertube/peertube/app/objectbucketclaim.yaml b/kubernetes/apps/database/crunchy-postgres/operator/objectbucketclaim.yaml similarity index 75% rename from kubernetes/apps/peertube/peertube/app/objectbucketclaim.yaml rename to kubernetes/apps/database/crunchy-postgres/operator/objectbucketclaim.yaml index d19ce34..73c9ec4 100644 --- a/kubernetes/apps/peertube/peertube/app/objectbucketclaim.yaml +++ b/kubernetes/apps/database/crunchy-postgres/operator/objectbucketclaim.yaml @@ -3,8 +3,8 @@ apiVersion: objectbucket.io/v1alpha1 kind: ObjectBucketClaim metadata: - name: pgo-peertube-backup-bucket-v1 + name: crunchy-postgres namespace: monitoring spec: - bucketName: pgo-peertube-backup-v1 + bucketName: crunchy-postgres storageClassName: ceph-bucket diff --git a/kubernetes/apps/peertube/peertube/app/kustomization.yaml b/kubernetes/apps/peertube/peertube/app/kustomization.yaml index 0b23445..58cbae9 100644 --- a/kubernetes/apps/peertube/peertube/app/kustomization.yaml +++ b/kubernetes/apps/peertube/peertube/app/kustomization.yaml @@ -8,7 +8,6 @@ resources: # - ./helmrelease.yaml # - ./ingress.yaml - ./postgresCluster.yaml - - ./objectbucketclaim.yaml - ./pvc.yaml configMapGenerator: - name: peertube-configmap diff --git a/kubernetes/apps/peertube/peertube/app/postgresCluster.yaml b/kubernetes/apps/peertube/peertube/app/postgresCluster.yaml index bac21f9..26c7be5 100644 --- a/kubernetes/apps/peertube/peertube/app/postgresCluster.yaml +++ b/kubernetes/apps/peertube/peertube/app/postgresCluster.yaml @@ -13,8 +13,8 @@ spec: postgresql: synchronous_commit: "on" pg_hba: - - host peertube peertube 10.32.0.0/16 md5 - - host all peertube 127.0.0.1 md5 + - hostnossl all all 10.32.0.0/16 md5 + - hostnossl all all all md5 # monitoring: # pgmonitor: # exporter: @@ -35,6 +35,8 @@ spec: databases: - peertube options: "SUPERUSER" + password: + type: AlphaNumeric backups: pgbackrest: configuration: @@ -56,6 +58,6 @@ spec: full: "0 1 * * 0" differential: "0 1 * * 1-6" s3: - bucket: "pgo-peertube-backup-v1" + bucket: "crunchy-postgres" endpoint: "rook-ceph-rgw-ceph-objectstore.rook-ceph.svc" region: ""