diff --git a/clusters/cl01tl/platform/gitea/Chart.yaml b/clusters/cl01tl/platform/gitea/Chart.yaml index 31c4ac66c..1b018ccbf 100644 --- a/clusters/cl01tl/platform/gitea/Chart.yaml +++ b/clusters/cl01tl/platform/gitea/Chart.yaml @@ -29,10 +29,6 @@ dependencies: alias: backup repository: https://bjw-s.github.io/helm-charts/ version: 3.5.1 - - name: postgres-cluster - alias: postgres-16-cluster - version: 3.19.0 - repository: http://alexlebens.github.io/helm-charts - name: postgres-cluster alias: postgres-17-cluster version: 3.19.0 diff --git a/clusters/cl01tl/platform/gitea/templates/external-secret.yaml b/clusters/cl01tl/platform/gitea/templates/external-secret.yaml index caf76f292..2ad25bb0d 100644 --- a/clusters/cl01tl/platform/gitea/templates/external-secret.yaml +++ b/clusters/cl01tl/platform/gitea/templates/external-secret.yaml @@ -136,10 +136,10 @@ spec: apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: gitea-postgresql-16-cluster-backup-secret + name: gitea-postgresql-17-cluster-backup-secret namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: gitea-postgresql-17-cluster-backup-secret app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: database diff --git a/clusters/cl01tl/platform/gitea/values.yaml b/clusters/cl01tl/platform/gitea/values.yaml index 024728202..129523966 100644 --- a/clusters/cl01tl/platform/gitea/values.yaml +++ b/clusters/cl01tl/platform/gitea/values.yaml @@ -6,20 +6,6 @@ gitea: tag: 1.22.4 ingress: enabled: false - className: traefik - annotations: - traefik.ingress.kubernetes.io/router.entrypoints: websecure - traefik.ingress.kubernetes.io/router.tls: "true" - cert-manager.io/cluster-issuer: letsencrypt-issuer - hosts: - - host: gitea.alexlebens.net - paths: - - path: / - pathType: Prefix - tls: - - secretName: gitea-secret-tls - hosts: - - gitea.alexlebens.net serviceAccount: create: true automountServiceAccountToken: true @@ -167,23 +153,8 @@ backup: s3: - path: /opt/backup readOnly: false -postgres-16-cluster: - mode: standalone - cluster: - walStorage: - storageClass: local-path - storage: - storageClass: local-path - monitoring: - enabled: true - backup: - enabled: true - endpointURL: https://nyc3.digitaloceanspaces.com - destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/gitea/gitea-postgresql-16-cluster - endpointCredentials: gitea-postgresql-16-cluster-backup-secret - backupIndex: 1 postgres-17-cluster: - mode: replica + mode: standalone cluster: image: repository: ghcr.io/cloudnative-pg/postgresql @@ -194,20 +165,8 @@ postgres-17-cluster: storageClass: local-path monitoring: enabled: true - replica: - importType: microservice - importDatabases: - - app - externalCluster: - connectionParameters: - host: gitea-postgresql-16-cluster-rw - user: app - dbname: app - password: - name: gitea-postgresql-16-cluster-app - key: password backup: - enabled: false + enabled: true endpointURL: https://nyc3.digitaloceanspaces.com destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/gitea/gitea-postgresql-17-cluster endpointCredentials: gitea-postgresql-17-cluster-backup-secret