diff --git a/clusters/cl01tl/helm/outline/Chart.lock b/clusters/cl01tl/helm/outline/Chart.lock index e2c4348b1..b9a87c654 100644 --- a/clusters/cl01tl/helm/outline/Chart.lock +++ b/clusters/cl01tl/helm/outline/Chart.lock @@ -8,5 +8,8 @@ dependencies: - name: postgres-cluster repository: oci://harbor.alexlebens.net/helm-charts version: 6.16.1 -digest: sha256:6ef789f9db4ad00ce2178a138c3c39a4e90eaef1e4244f52282bc0cb3094f4f5 -generated: "2025-12-07T02:55:32.91116723Z" +- name: postgres-cluster + repository: oci://harbor.alexlebens.net/helm-charts + version: 6.16.1 +digest: sha256:8203c685019682efe011ec2f2e6c9e81e6b33a10f29aab022a713c63415b5556 +generated: "2025-12-13T18:10:27.380776-06:00" diff --git a/clusters/cl01tl/helm/outline/Chart.yaml b/clusters/cl01tl/helm/outline/Chart.yaml index fb0adfd6f..b46c29021 100644 --- a/clusters/cl01tl/helm/outline/Chart.yaml +++ b/clusters/cl01tl/helm/outline/Chart.yaml @@ -30,5 +30,9 @@ dependencies: 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 + repository: oci://harbor.alexlebens.net/helm-charts icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/outline.png -appVersion: 0.84.0 +appVersion: 1.1.0 diff --git a/clusters/cl01tl/helm/outline/templates/external-secret.yaml b/clusters/cl01tl/helm/outline/templates/external-secret.yaml index 7fa5518f1..3be5a5145 100644 --- a/clusters/cl01tl/helm/outline/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/outline/templates/external-secret.yaml @@ -146,3 +146,70 @@ spec: key: /garage/home-infra/postgres-backups metadataPolicy: None property: ACCESS_REGION + +--- +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: outline-postgresql-18-cluster-backup-secret + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: outline-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: outline-postgresql-18-cluster-backup-secret-garage + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: outline-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/outline/templates/redis-replication.yaml b/clusters/cl01tl/helm/outline/templates/redis-replication.yaml index af65e0566..bef3bf50f 100644 --- a/clusters/cl01tl/helm/outline/templates/redis-replication.yaml +++ b/clusters/cl01tl/helm/outline/templates/redis-replication.yaml @@ -13,7 +13,7 @@ spec: runAsUser: 1000 fsGroup: 1000 kubernetesConfig: - image: quay.io/opstree/redis:v8.0.3 + image: quay.io/opstree/redis:v8.4.0 imagePullPolicy: IfNotPresent resources: requests: @@ -29,4 +29,4 @@ spec: storage: 1Gi redisExporter: enabled: true - image: quay.io/opstree/redis-exporter:v1.48.0 + image: quay.io/opstree/redis-exporter:v1.80.1 diff --git a/clusters/cl01tl/helm/outline/templates/redis-sentinel.yaml b/clusters/cl01tl/helm/outline/templates/redis-sentinel.yaml new file mode 100644 index 000000000..a5e2db244 --- /dev/null +++ b/clusters/cl01tl/helm/outline/templates/redis-sentinel.yaml @@ -0,0 +1,23 @@ +apiVersion: redis.redis.opstreelabs.in/v1beta2 +kind: RedisSentinel +metadata: + name: redis-sentinel-outline + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: redis-sentinel-outline + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Name }} +spec: + clusterSize: 3 + podSecurityContext: + runAsUser: 1000 + fsGroup: 1000 + redisSentinelConfig: + redisReplicationName: redis-replication-outline + kubernetesConfig: + image: quay.io/opstree/redis-sentinel:v8.4.0 + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 128Mi diff --git a/clusters/cl01tl/helm/outline/values.yaml b/clusters/cl01tl/helm/outline/values.yaml index 6d0f6c784..e41a0703a 100644 --- a/clusters/cl01tl/helm/outline/values.yaml +++ b/clusters/cl01tl/helm/outline/values.yaml @@ -201,3 +201,77 @@ postgres-17-cluster: # suspend: false # schedule: "0 10 4 * * SAT" # backupName: garage-remote +postgres-18-cluster: + mode: recovery + cluster: + image: + repository: ghcr.io/cloudnative-pg/postgresql + tag: 18.1-standard-trixie + storage: + storageClass: local-path + walStorage: + storageClass: local-path + monitoring: + enabled: true + prometheusRule: + enabled: true + recovery: + method: import + objectStore: + destinationPath: s3://postgres-backups/cl01tl/outline/outline-postgresql-18-cluster + endpointURL: http://garage-main.garage:3900 + index: 1 + endpointCredentials: outline-postgresql-18-cluster-backup-secret-garage + import: + type: "microservice" + databases: + - app + source: + host: "outline-postgresql-17-cluster-rw" + port: 5432 + username: app + database: app + sslMode: "disable" + passwordSecret: + name: "outline-postgresql-17-cluster-app" + key: "password" + backup: + objectStore: + - name: external + destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/outline/outline-postgresql-18-cluster + index: 1 + retentionPolicy: "30d" + isWALArchiver: false + - name: garage-local + destinationPath: s3://postgres-backups/cl01tl/outline/outline-postgresql-18-cluster + index: 1 + endpointURL: http://garage-main.garage:3900 + endpointCredentials: outline-postgresql-18-cluster-backup-secret-garage + endpointCredentialsIncludeRegion: true + retentionPolicy: "3d" + isWALArchiver: true + # - name: garage-remote + # destinationPath: s3://postgres-backups/cl01tl/outline/outline-postgresql-18-cluster + # index: 1 + # endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900 + # endpointCredentials: outline-postgresql-18-cluster-backup-secret-garage + # retentionPolicy: "30d" + # data: + # compression: bzip2 + # jobs: 2 + scheduledBackups: + - name: daily-backup + suspend: false + immediate: true + 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 + # immediate: true + # schedule: "0 10 4 * * SAT" + # backupName: garage-remote