diff --git a/kubernetes/apps/peertube/peertube/app/postgresCluster.yaml b/kubernetes/apps/peertube/peertube/app/postgresCluster.yaml index b86313e..7aa08a0 100644 --- a/kubernetes/apps/peertube/peertube/app/postgresCluster.yaml +++ b/kubernetes/apps/peertube/peertube/app/postgresCluster.yaml @@ -55,24 +55,7 @@ spec: schedules: full: "0 1 * * 0" differential: "0 1 * * 1-6" -valuesFrom: - - targetPath: backups.pgbackrest.repos.repo1.s3.bucket - kind: ConfigMap - name: pgo-peertube-backup-bucket-v1 - valuesKey: BUCKET_NAME - - targetPath: backups.pgbackrest.repos.repo1.s3.endpoint - kind: ConfigMap - name: pgo-peertube-backup-bucket-v1 - valuesKey: BUCKET_HOST - - targetPath: backups.pgbackrest.repos.repo1.s3.region - kind: ConfigMap - name: pgo-peertube-backup-bucket-v1 - valuesKey: BUCKET_REGION - - targetPath: objstoreConfig.config.access_key - kind: Secret - name: pgo-peertube-backup-bucket-v1 - valuesKey: AWS_ACCESS_KEY_ID - - targetPath: objstoreConfig.config.secret_key - kind: Secret - name: pgo-peertube-backup-bucket-v1 - valuesKey: AWS_SECRET_ACCESS_KEY + s3: + bucket: "pgo-peertube-backup-v1" + endpoint: "rook-ceph-rgw-ceph-objectstore.rook-ceph.svc" + region: "" diff --git a/kubernetes/apps/peertube/peertube/redis/ks.yaml b/kubernetes/apps/peertube/peertube/redis/ks.yaml new file mode 100644 index 0000000..8376896 --- /dev/null +++ b/kubernetes/apps/peertube/peertube/redis/ks.yaml @@ -0,0 +1,17 @@ +--- +# yaml-language-server: $schema=https://ks.hsn.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: cluster-apps-redis-peertube + namespace: flux-system +spec: + path: ./kubernetes/apps/peertube/peertube/redis/peertube + prune: true + sourceRef: + kind: GitRepository + name: valinor + wait: false + interval: 30m + retryInterval: 1m + timeout: 15m diff --git a/kubernetes/apps/peertube/peertube/redis/helmrelease.yaml b/kubernetes/apps/peertube/peertube/redis/peertube/helmrelease.yaml similarity index 100% rename from kubernetes/apps/peertube/peertube/redis/helmrelease.yaml rename to kubernetes/apps/peertube/peertube/redis/peertube/helmrelease.yaml diff --git a/kubernetes/apps/peertube/peertube/redis/kustomization.yaml b/kubernetes/apps/peertube/peertube/redis/peertube/kustomization.yaml similarity index 100% rename from kubernetes/apps/peertube/peertube/redis/kustomization.yaml rename to kubernetes/apps/peertube/peertube/redis/peertube/kustomization.yaml diff --git a/kubernetes/apps/security/external-secrets/cluster-secrets/pgo-s3-creds.yaml b/kubernetes/apps/security/external-secrets/cluster-secrets/pgo-s3-creds.yaml index a96fba7..daba91e 100644 --- a/kubernetes/apps/security/external-secrets/cluster-secrets/pgo-s3-creds.yaml +++ b/kubernetes/apps/security/external-secrets/cluster-secrets/pgo-s3-creds.yaml @@ -26,16 +26,16 @@ spec: data: s3.conf: | [global] - repo1-s3-key={{ .minio_crunchy_postgres_access_key }} - repo1-s3-key-secret={{ .minio_crunchy_postgres_secret_key }} + repo1-s3-key={{ .pgo_crunchy_postgres_access_key }} + repo1-s3-key-secret={{ .pgo_crunchy_postgres_secret_key }} dataFrom: - extract: - key: minio + key: pgo-s3-creds rewrite: - regexp: source: "[-]" target: "_" - regexp: source: "(.*)" - target: "minio_$1" + target: "pgo_$1"