From 3845b4058d352bdcd0b151ab41352ac8cc341c8a Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Tue, 23 Dec 2025 17:18:47 -0600 Subject: [PATCH] update chart --- .../helm/ephemera/templates/http-route.yaml | 28 -------- clusters/cl01tl/helm/harbor/Chart.lock | 6 +- clusters/cl01tl/helm/harbor/Chart.yaml | 2 +- .../harbor/templates/external-secret.yaml | 67 ------------------- clusters/cl01tl/helm/harbor/values.yaml | 44 +++++------- 5 files changed, 20 insertions(+), 127 deletions(-) delete mode 100644 clusters/cl01tl/helm/ephemera/templates/http-route.yaml diff --git a/clusters/cl01tl/helm/ephemera/templates/http-route.yaml b/clusters/cl01tl/helm/ephemera/templates/http-route.yaml deleted file mode 100644 index 16c8b2bbd..000000000 --- a/clusters/cl01tl/helm/ephemera/templates/http-route.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: gateway.networking.k8s.io/v1 -kind: HTTPRoute -metadata: - name: http-route-ephemera - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: http-route-ephemera - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - parentRefs: - - group: gateway.networking.k8s.io - kind: Gateway - name: traefik-gateway - namespace: traefik - hostnames: - - ephemera.alexlebens.net - rules: - - matches: - - path: - type: PathPrefix - value: / - backendRefs: - - group: '' - kind: Service - name: ephemera - port: 80 - weight: 100 diff --git a/clusters/cl01tl/helm/harbor/Chart.lock b/clusters/cl01tl/helm/harbor/Chart.lock index 8782c7ad1..44e58322f 100644 --- a/clusters/cl01tl/helm/harbor/Chart.lock +++ b/clusters/cl01tl/helm/harbor/Chart.lock @@ -4,9 +4,9 @@ dependencies: version: 1.18.1 - name: postgres-cluster repository: https://gitea.alexlebens.net/api/packages/alexlebens/helm - version: 7.1.4 + version: 7.4.3 - name: redis-replication repository: oci://harbor.alexlebens.net/helm-charts version: 0.5.0 -digest: sha256:7cea680b9916e657e3120b01bd434f50b15eaf489d1f7cee3b506aa95955f1c0 -generated: "2025-12-21T19:03:07.066453096Z" +digest: sha256:8f27e668381e0ce960f2dfcb6bb5b33feb708497b088b6af2a72a5816bc3df6d +generated: "2025-12-23T17:17:55.749328-06:00" diff --git a/clusters/cl01tl/helm/harbor/Chart.yaml b/clusters/cl01tl/helm/harbor/Chart.yaml index 00a681626..adb838423 100644 --- a/clusters/cl01tl/helm/harbor/Chart.yaml +++ b/clusters/cl01tl/helm/harbor/Chart.yaml @@ -21,7 +21,7 @@ dependencies: repository: https://helm.goharbor.io - name: postgres-cluster alias: postgres-18-cluster - version: 7.1.4 + version: 7.4.3 repository: https://gitea.alexlebens.net/api/packages/alexlebens/helm - name: redis-replication version: 0.5.0 diff --git a/clusters/cl01tl/helm/harbor/templates/external-secret.yaml b/clusters/cl01tl/helm/harbor/templates/external-secret.yaml index cbee44de3..54eca6055 100644 --- a/clusters/cl01tl/helm/harbor/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/harbor/templates/external-secret.yaml @@ -96,70 +96,3 @@ spec: key: /cl01tl/harbor/registry metadataPolicy: None property: REGISTRY_CREDENTIAL_PASSWORD - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: harbor-postgresql-18-cluster-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: harbor-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -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 - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: harbor-postgresql-18-cluster-backup-secret-garage - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: harbor-postgresql-18-cluster-backup-secret-garage - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - data: - - 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 - - secretKey: ACCESS_REGION - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /garage/home-infra/postgres-backups - metadataPolicy: None - property: ACCESS_REGION diff --git a/clusters/cl01tl/helm/harbor/values.yaml b/clusters/cl01tl/helm/harbor/values.yaml index 31f2aca01..c3ce968ab 100644 --- a/clusters/cl01tl/helm/harbor/values.yaml +++ b/clusters/cl01tl/helm/harbor/values.yaml @@ -98,58 +98,46 @@ harbor: replicas: 2 postgres-18-cluster: mode: recovery - cluster: - storage: - storageClass: local-path - walStorage: - storageClass: local-path recovery: method: objectStore objectStore: - destinationPath: s3://postgres-backups/cl01tl/harbor/harbor-postgresql-18-cluster - endpointURL: http://garage-main.garage:3900 index: 1 - endpointCredentials: harbor-postgresql-18-cluster-backup-secret-garage backup: objectStore: - name: garage-local - destinationPath: s3://postgres-backups/cl01tl/harbor/harbor-postgresql-18-cluster index: 1 - endpointURL: http://garage-main.garage:3900 - endpointCredentials: harbor-postgresql-18-cluster-backup-secret-garage - endpointCredentialsIncludeRegion: true - retentionPolicy: "3d" + destinationBucket: postgres-backups + externalSecretCredentialPath: /garage/home-infra/postgres-backups isWALArchiver: true - # - name: external - # destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/harbor/harbor-postgresql-18-cluster - # index: 1 - # retentionPolicy: "30d" - # isWALArchiver: false # - name: garage-remote - # destinationPath: s3://postgres-backups/cl01tl/harbor/harbor-postgresql-18-cluster # index: 1 - # endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900 - # endpointCredentials: harbor-postgresql-18-cluster-backup-secret-garage - # retentionPolicy: "30d" + # destinationBucket: postgres-backups + # externalSecretCredentialPath: /garage/home-infra/postgres-backups + # retentionPolicy: "90d" # data: # compression: bzip2 - # jobs: 2 + # - name: external + # index: 1 + # endpointURL: https://nyc3.digitaloceanspaces.com + # destinationBucket: postgres-backups-ce540ddf106d186bbddca68a + # externalSecretCredentialPath: /garage/home-infra/postgres-backups + # isWALArchiver: false scheduledBackups: - name: live-backup suspend: false immediate: true schedule: "0 0 0 * * *" backupName: garage-local - # - name: daily-backup - # suspend: false - # immediate: true - # schedule: "0 0 0 * * *" - # backupName: external # - name: weekly-backup # suspend: true # immediate: true # schedule: "0 0 4 * * SAT" # backupName: garage-remote + # - name: daily-backup + # suspend: true + # immediate: true + # schedule: "0 0 0 * * *" + # backupName: external redis-replication: existingSecret: enabled: false