From d59e8b5c7b1c19c809ed7f4cdbc50466f6196333 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Sun, 22 Dec 2024 22:44:16 -0600 Subject: [PATCH] add pg-17 --- clusters/cl01tl/platform/ollama/Chart.yaml | 6 +++- .../ollama/templates/external-secret.yaml | 32 +++++++++++++++++++ clusters/cl01tl/platform/ollama/values.yaml | 30 +++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/clusters/cl01tl/platform/ollama/Chart.yaml b/clusters/cl01tl/platform/ollama/Chart.yaml index 3b7900171..b11940c71 100644 --- a/clusters/cl01tl/platform/ollama/Chart.yaml +++ b/clusters/cl01tl/platform/ollama/Chart.yaml @@ -23,7 +23,11 @@ dependencies: version: 3.5.1 - name: postgres-cluster alias: postgres-16-cluster - version: 3.19.0 + version: 3.21.0 + repository: http://alexlebens.github.io/helm-charts + - name: postgres-cluster + alias: postgres-17-cluster + version: 3.21.0 repository: http://alexlebens.github.io/helm-charts icon: https://avatars.githubusercontent.com/u/151674099?s=48&v=4 appVersion: 0.5.1 diff --git a/clusters/cl01tl/platform/ollama/templates/external-secret.yaml b/clusters/cl01tl/platform/ollama/templates/external-secret.yaml index 90aa52adc..2b3c451f0 100644 --- a/clusters/cl01tl/platform/ollama/templates/external-secret.yaml +++ b/clusters/cl01tl/platform/ollama/templates/external-secret.yaml @@ -204,3 +204,35 @@ spec: key: /digital-ocean/home-infra/postgres-backups metadataPolicy: None property: secret + +--- +apiVersion: external-secrets.io/v1beta1 +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/version: {{ .Chart.AppVersion }} + app.kubernetes.io/component: database + 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 diff --git a/clusters/cl01tl/platform/ollama/values.yaml b/clusters/cl01tl/platform/ollama/values.yaml index d5ca071cc..d172560c1 100644 --- a/clusters/cl01tl/platform/ollama/values.yaml +++ b/clusters/cl01tl/platform/ollama/values.yaml @@ -152,3 +152,33 @@ postgres-16-cluster: destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/ollama/ollama-web-postgresql-16-cluster endpointCredentials: ollama-web-postgresql-16-cluster-backup-secret backupIndex: 1 +postgres-17-cluster: + mode: replica + cluster: + image: + repository: ghcr.io/cloudnative-pg/postgresql + tag: "17.2-22" + walStorage: + storageClass: local-path + storage: + storageClass: local-path + monitoring: + enabled: true + replica: + importType: microservice + importDatabases: + - app + externalCluster: + connectionParameters: + host: ollama-web-postgresql-16-cluster-rw + user: app + dbname: app + password: + name: ollama-web-postgresql-16-cluster-app + key: password + backup: + enabled: false + endpointURL: https://nyc3.digitaloceanspaces.com + destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/ollama/ollama-web-postgresql-17-cluster + endpointCredentials: ollama-web-postgresql-17-cluster-backup-secret + backupIndex: 1