From 386e118d7a737374da708965ff3acc491070afd6 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Tue, 23 Dec 2025 04:59:20 +0000 Subject: [PATCH] chore: Update manifests after change --- ...-argo-workflows-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...s-postgresql-18-cluster-backup-secret.yaml | 28 ------------- ...kflows-postgresql-18-recovery-secret.yaml} | 22 ++++++----- ...ws-postgresql-18-backup-garage-local.yaml} | 16 ++++---- ...argo-workflows-postgresql-18-recovery.yaml | 12 ++++-- ...o-workflows-postgresql-18-alert-rules.yaml | 4 +- ...resql-18-live-backup-scheduled-backup.yaml | 4 +- 8 files changed, 73 insertions(+), 56 deletions(-) create mode 100644 clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/argo-workflows/{ExternalSecret-argo-workflows-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-argo-workflows-postgresql-18-recovery-secret.yaml} (75%) rename clusters/cl01tl/manifests/argo-workflows/{ObjectStore-argo-workflows-postgresql-18-garage-local-backup.yaml => ObjectStore-argo-workflows-postgresql-18-backup-garage-local.yaml} (57%) diff --git a/clusters/cl01tl/manifests/argo-workflows/Cluster-argo-workflows-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/argo-workflows/Cluster-argo-workflows-postgresql-18-cluster.yaml index ebd9db7c1..64e207bae 100644 --- a/clusters/cl01tl/manifests/argo-workflows/Cluster-argo-workflows-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/argo-workflows/Cluster-argo-workflows-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: argo-workflows-postgresql-18-cluster namespace: argo-workflows labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.1 app.kubernetes.io/name: argo-workflows-postgresql-18 app.kubernetes.io/instance: argo-workflows app.kubernetes.io/part-of: argo-workflows - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.1" app.kubernetes.io/managed-by: Helm spec: instances: 3 diff --git a/clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..ebc6ba041 --- /dev/null +++ b/clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: argo-workflows-postgresql-18-backup-garage-local-secret + namespace: argo-workflows + labels: + helm.sh/chart: postgres-18-cluster-7.4.1 + app.kubernetes.io/name: argo-workflows-postgresql-18 + app.kubernetes.io/instance: argo-workflows + app.kubernetes.io/part-of: argo-workflows + app.kubernetes.io/version: "7.4.1" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: argo-workflows-postgresql-18-backup-garage-local-secret +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION + - secretKey: ACCESS_KEY_ID + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_KEY_ID + - secretKey: ACCESS_SECRET_KEY + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_SECRET_KEY diff --git a/clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 842495591..000000000 --- a/clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: argo-workflows-postgresql-18-cluster-backup-secret - namespace: argo-workflows - labels: - app.kubernetes.io/name: argo-workflows-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: argo-workflows - app.kubernetes.io/part-of: argo-workflows -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - data: - - secretKey: ACCESS_KEY_ID - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /digital-ocean/home-infra/postgres-backups - metadataPolicy: None - property: access - - secretKey: ACCESS_SECRET_KEY - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /digital-ocean/home-infra/postgres-backups - metadataPolicy: None - property: secret diff --git a/clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-recovery-secret.yaml similarity index 75% rename from clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-recovery-secret.yaml index e5af4cabe..f7fcb784e 100644 --- a/clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/argo-workflows/ExternalSecret-argo-workflows-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: argo-workflows-postgresql-18-cluster-backup-secret-garage + name: argo-workflows-postgresql-18-recovery-secret namespace: argo-workflows labels: - app.kubernetes.io/name: argo-workflows-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.1 + app.kubernetes.io/name: argo-workflows-postgresql-18 app.kubernetes.io/instance: argo-workflows app.kubernetes.io/part-of: argo-workflows + app.kubernetes.io/version: "7.4.1" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: argo-workflows-postgresql-18-recovery-secret spec: secretStoreRef: kind: ClusterSecretStore name: vault data: + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION - secretKey: ACCESS_KEY_ID remoteRef: conversionStrategy: Default @@ -26,10 +37,3 @@ spec: key: /garage/home-infra/postgres-backups metadataPolicy: None property: ACCESS_SECRET_KEY - - secretKey: ACCESS_REGION - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /garage/home-infra/postgres-backups - metadataPolicy: None - property: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/argo-workflows/ObjectStore-argo-workflows-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/argo-workflows/ObjectStore-argo-workflows-postgresql-18-backup-garage-local.yaml similarity index 57% rename from clusters/cl01tl/manifests/argo-workflows/ObjectStore-argo-workflows-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/argo-workflows/ObjectStore-argo-workflows-postgresql-18-backup-garage-local.yaml index bfa0cf093..aa112e7b7 100644 --- a/clusters/cl01tl/manifests/argo-workflows/ObjectStore-argo-workflows-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/argo-workflows/ObjectStore-argo-workflows-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,25 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "argo-workflows-postgresql-18-garage-local-backup" + name: argo-workflows-postgresql-18-backup-garage-local namespace: argo-workflows labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.1 app.kubernetes.io/name: argo-workflows-postgresql-18 app.kubernetes.io/instance: argo-workflows app.kubernetes.io/part-of: argo-workflows - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.1" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: argo-workflows-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/argo-workflows/argo-workflows-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: argo-workflows-postgresql-18-cluster-backup-secret-garage + name: argo-workflows-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: argo-workflows-postgresql-18-cluster-backup-secret-garage + name: argo-workflows-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY - region: - name: argo-workflows-postgresql-18-cluster-backup-secret-garage - key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/argo-workflows/ObjectStore-argo-workflows-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/argo-workflows/ObjectStore-argo-workflows-postgresql-18-recovery.yaml index 235a59a93..9558f3ea1 100644 --- a/clusters/cl01tl/manifests/argo-workflows/ObjectStore-argo-workflows-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/argo-workflows/ObjectStore-argo-workflows-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "argo-workflows-postgresql-18-recovery" namespace: argo-workflows labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.1 app.kubernetes.io/name: argo-workflows-postgresql-18 app.kubernetes.io/instance: argo-workflows app.kubernetes.io/part-of: argo-workflows - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.1" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "argo-workflows-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/argo-workflows/argo-workflows-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: argo-workflows-postgresql-18-cluster-backup-secret-garage + name: argo-workflows-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: argo-workflows-postgresql-18-cluster-backup-secret-garage + name: argo-workflows-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: argo-workflows-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/argo-workflows/PrometheusRule-argo-workflows-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/argo-workflows/PrometheusRule-argo-workflows-postgresql-18-alert-rules.yaml index cc503aee3..a2dc8e9b2 100644 --- a/clusters/cl01tl/manifests/argo-workflows/PrometheusRule-argo-workflows-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/argo-workflows/PrometheusRule-argo-workflows-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: argo-workflows-postgresql-18-alert-rules namespace: argo-workflows labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.1 app.kubernetes.io/name: argo-workflows-postgresql-18 app.kubernetes.io/instance: argo-workflows app.kubernetes.io/part-of: argo-workflows - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.1" app.kubernetes.io/managed-by: Helm spec: groups: diff --git a/clusters/cl01tl/manifests/argo-workflows/ScheduledBackup-argo-workflows-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/argo-workflows/ScheduledBackup-argo-workflows-postgresql-18-live-backup-scheduled-backup.yaml index 84c19fac6..82d9295ae 100644 --- a/clusters/cl01tl/manifests/argo-workflows/ScheduledBackup-argo-workflows-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/argo-workflows/ScheduledBackup-argo-workflows-postgresql-18-live-backup-scheduled-backup.yaml @@ -4,11 +4,11 @@ metadata: name: "argo-workflows-postgresql-18-live-backup-scheduled-backup" namespace: argo-workflows labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.1 app.kubernetes.io/name: argo-workflows-postgresql-18 app.kubernetes.io/instance: argo-workflows app.kubernetes.io/part-of: argo-workflows - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.1" app.kubernetes.io/managed-by: Helm spec: immediate: true