From 9226bb7579b2bd605fee0f282a2439ec1c4fb8ab Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Sat, 13 Dec 2025 15:10:28 -0600 Subject: [PATCH] remove old cluster --- clusters/cl01tl/helm/ollama/Chart.lock | 7 +- clusters/cl01tl/helm/ollama/Chart.yaml | 4 -- .../ollama/templates/external-secret.yaml | 67 ------------------- clusters/cl01tl/helm/ollama/values.yaml | 58 ---------------- 4 files changed, 2 insertions(+), 134 deletions(-) diff --git a/clusters/cl01tl/helm/ollama/Chart.lock b/clusters/cl01tl/helm/ollama/Chart.lock index ba56d4f7a..a3c7c0fec 100644 --- a/clusters/cl01tl/helm/ollama/Chart.lock +++ b/clusters/cl01tl/helm/ollama/Chart.lock @@ -5,8 +5,5 @@ dependencies: - name: postgres-cluster repository: oci://harbor.alexlebens.net/helm-charts version: 6.16.1 -- name: postgres-cluster - repository: oci://harbor.alexlebens.net/helm-charts - version: 6.16.1 -digest: sha256:c50a66e185bc75e074c0d96e66ccb1de7fad2207cea90babedbaf1e6dc4403dd -generated: "2025-12-13T15:05:06.144844-06:00" +digest: sha256:812007fb0c14b91aa1118e6c26923d69f28ae3e27f890fee2d64dfecdbdee9a4 +generated: "2025-12-13T15:08:35.961154-06:00" diff --git a/clusters/cl01tl/helm/ollama/Chart.yaml b/clusters/cl01tl/helm/ollama/Chart.yaml index fe3fe27f1..f33bcc485 100644 --- a/clusters/cl01tl/helm/ollama/Chart.yaml +++ b/clusters/cl01tl/helm/ollama/Chart.yaml @@ -21,10 +21,6 @@ dependencies: alias: ollama repository: https://bjw-s-labs.github.io/helm-charts/ version: 4.5.0 - - name: postgres-cluster - alias: postgres-17-cluster - version: 6.16.1 - repository: oci://harbor.alexlebens.net/helm-charts - name: postgres-cluster alias: postgres-18-cluster version: 6.16.1 diff --git a/clusters/cl01tl/helm/ollama/templates/external-secret.yaml b/clusters/cl01tl/helm/ollama/templates/external-secret.yaml index 0d27136a6..af6d8c067 100644 --- a/clusters/cl01tl/helm/ollama/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/ollama/templates/external-secret.yaml @@ -108,73 +108,6 @@ spec: metadataPolicy: None property: secret_key ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: ollama-web-postgresql-17-cluster-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: ollama-web-postgresql-17-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: ollama-web-postgresql-17-cluster-backup-secret-garage - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: ollama-web-postgresql-17-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 - --- apiVersion: external-secrets.io/v1 kind: ExternalSecret diff --git a/clusters/cl01tl/helm/ollama/values.yaml b/clusters/cl01tl/helm/ollama/values.yaml index b72dcccc0..b488f16e4 100644 --- a/clusters/cl01tl/helm/ollama/values.yaml +++ b/clusters/cl01tl/helm/ollama/values.yaml @@ -236,64 +236,6 @@ ollama: main: - path: /app/backend/data readOnly: false -postgres-17-cluster: - nameOverride: ollama-web-postgresql-17 - mode: recovery - cluster: - storage: - storageClass: local-path - walStorage: - storageClass: local-path - monitoring: - enabled: true - prometheusRule: - enabled: true - recovery: - method: objectStore - objectStore: - destinationPath: s3://postgres-backups/cl01tl/ollama/ollama-web-postgresql-17-cluster - endpointURL: http://garage-main.garage:3900 - index: 1 - endpointCredentials: ollama-web-postgresql-17-cluster-backup-secret-garage - backup: - objectStore: - - name: external - destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/ollama/ollama-web-postgresql-17-cluster - index: 1 - endpointCredentials: ollama-web-postgresql-17-cluster-backup-secret - retentionPolicy: "30d" - isWALArchiver: false - - name: garage-local - destinationPath: s3://postgres-backups/cl01tl/ollama/ollama-web-postgresql-17-cluster - index: 1 - endpointURL: http://garage-main.garage:3900 - endpointCredentials: ollama-web-postgresql-17-cluster-backup-secret-garage - endpointCredentialsIncludeRegion: true - retentionPolicy: "3d" - isWALArchiver: true - # - name: garage-remote - # destinationPath: s3://postgres-backups/cl01tl/ollama/ollama-web-postgresql-17-cluster - # index: 1 - # endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900 - # endpointCredentials: ollama-web-postgresql-17-cluster-backup-secret-garage - # retentionPolicy: "30d" - # data: - # compression: bzip2 - # jobs: 2 - scheduledBackups: - - name: daily-backup - suspend: false - schedule: "0 0 0 * * *" - backupName: external - - name: live-backup - suspend: false - immediate: true - schedule: "0 0 0 * * *" - backupName: garage-local - # - name: weekly-backup - # suspend: false - # schedule: "0 0 4 * * SAT" - # backupName: garage-remote postgres-18-cluster: nameOverride: ollama-web-postgresql-18 mode: recovery