diff --git a/clusters/standby/platform/gitea/Chart.yaml b/clusters/cl01tl/platform/gitea/Chart.yaml similarity index 89% rename from clusters/standby/platform/gitea/Chart.yaml rename to clusters/cl01tl/platform/gitea/Chart.yaml index 94411a04d..bbafde3b4 100644 --- a/clusters/standby/platform/gitea/Chart.yaml +++ b/clusters/cl01tl/platform/gitea/Chart.yaml @@ -25,10 +25,10 @@ dependencies: alias: cloudflared repository: http://alexlebens.github.io/helm-charts version: 1.13.0 - - name: app-template - alias: backup - repository: https://bjw-s.github.io/helm-charts/ - version: 3.6.1 + # - name: app-template + # alias: backup + # repository: https://bjw-s.github.io/helm-charts/ + # version: 3.6.1 - name: postgres-cluster alias: postgres-17-cluster version: 4.1.4 diff --git a/clusters/standby/platform/gitea/templates/external-secret.yaml b/clusters/cl01tl/platform/gitea/templates/external-secret.yaml similarity index 69% rename from clusters/standby/platform/gitea/templates/external-secret.yaml rename to clusters/cl01tl/platform/gitea/templates/external-secret.yaml index 2ad25bb0d..0997d490f 100644 --- a/clusters/standby/platform/gitea/templates/external-secret.yaml +++ b/clusters/cl01tl/platform/gitea/templates/external-secret.yaml @@ -86,51 +86,51 @@ spec: metadataPolicy: None property: token ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: gitea-backup-s3 - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: gitea-backup-s3 - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: backup - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - data: - - secretKey: AWS_ACCESS_KEY_ID - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /digital-ocean/home-infra/gitea-backup - metadataPolicy: None - property: AWS_ACCESS_KEY_ID - - secretKey: AWS_DEFAULT_REGION - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /digital-ocean/home-infra/gitea-backup - metadataPolicy: None - property: AWS_DEFAULT_REGION - - secretKey: AWS_ENDPOINT_URL - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /digital-ocean/home-infra/gitea-backup - metadataPolicy: None - property: AWS_ENDPOINT_URL - - secretKey: AWS_SECRET_ACCESS_KEY - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /digital-ocean/home-infra/gitea-backup - metadataPolicy: None - property: AWS_SECRET_ACCESS_KEY +# --- +# apiVersion: external-secrets.io/v1beta1 +# kind: ExternalSecret +# metadata: +# name: gitea-backup-s3 +# namespace: {{ .Release.Namespace }} +# labels: +# app.kubernetes.io/name: gitea-backup-s3 +# app.kubernetes.io/instance: {{ .Release.Name }} +# app.kubernetes.io/version: {{ .Chart.AppVersion }} +# app.kubernetes.io/component: backup +# app.kubernetes.io/part-of: {{ .Release.Name }} +# spec: +# secretStoreRef: +# kind: ClusterSecretStore +# name: vault +# data: +# - secretKey: AWS_ACCESS_KEY_ID +# remoteRef: +# conversionStrategy: Default +# decodingStrategy: None +# key: /digital-ocean/home-infra/gitea-backup +# metadataPolicy: None +# property: AWS_ACCESS_KEY_ID +# - secretKey: AWS_DEFAULT_REGION +# remoteRef: +# conversionStrategy: Default +# decodingStrategy: None +# key: /digital-ocean/home-infra/gitea-backup +# metadataPolicy: None +# property: AWS_DEFAULT_REGION +# - secretKey: AWS_ENDPOINT_URL +# remoteRef: +# conversionStrategy: Default +# decodingStrategy: None +# key: /digital-ocean/home-infra/gitea-backup +# metadataPolicy: None +# property: AWS_ENDPOINT_URL +# - secretKey: AWS_SECRET_ACCESS_KEY +# remoteRef: +# conversionStrategy: Default +# decodingStrategy: None +# key: /digital-ocean/home-infra/gitea-backup +# metadataPolicy: None +# property: AWS_SECRET_ACCESS_KEY --- apiVersion: external-secrets.io/v1beta1 diff --git a/clusters/standby/platform/gitea/templates/ingress.yaml b/clusters/cl01tl/platform/gitea/templates/ingress.yaml similarity index 94% rename from clusters/standby/platform/gitea/templates/ingress.yaml rename to clusters/cl01tl/platform/gitea/templates/ingress.yaml index 65dadbb72..65b0010a7 100644 --- a/clusters/standby/platform/gitea/templates/ingress.yaml +++ b/clusters/cl01tl/platform/gitea/templates/ingress.yaml @@ -43,8 +43,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: {{ .Release.Name }} - annotations: - tailscale.com/experimental-forward-cluster-traffic-via-ingress: "true" spec: ingressClassName: tailscale tls: diff --git a/clusters/standby/platform/gitea/templates/persistent-volume-claim.yaml b/clusters/cl01tl/platform/gitea/templates/persistent-volume-claim.yaml similarity index 100% rename from clusters/standby/platform/gitea/templates/persistent-volume-claim.yaml rename to clusters/cl01tl/platform/gitea/templates/persistent-volume-claim.yaml diff --git a/clusters/standby/platform/gitea/templates/role-binding.yaml b/clusters/cl01tl/platform/gitea/templates/role-binding.yaml similarity index 100% rename from clusters/standby/platform/gitea/templates/role-binding.yaml rename to clusters/cl01tl/platform/gitea/templates/role-binding.yaml diff --git a/clusters/standby/platform/gitea/templates/role.yaml b/clusters/cl01tl/platform/gitea/templates/role.yaml similarity index 100% rename from clusters/standby/platform/gitea/templates/role.yaml rename to clusters/cl01tl/platform/gitea/templates/role.yaml diff --git a/clusters/standby/platform/gitea/values.yaml b/clusters/cl01tl/platform/gitea/values.yaml similarity index 95% rename from clusters/standby/platform/gitea/values.yaml rename to clusters/cl01tl/platform/gitea/values.yaml index c08f75d4e..dd40f148a 100644 --- a/clusters/standby/platform/gitea/values.yaml +++ b/clusters/cl01tl/platform/gitea/values.yaml @@ -166,7 +166,7 @@ backup: - path: /opt/backup readOnly: false postgres-17-cluster: - mode: standalone + mode: recovery cluster: walStorage: storageClass: local-path @@ -174,9 +174,13 @@ postgres-17-cluster: storageClass: local-path monitoring: enabled: true + recovery: + endpointURL: https://nyc3.digitaloceanspaces.com + destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/gitea/gitea-postgresql-17-cluster + recoveryIndex: 1 backup: - enabled: true + enabled: false endpointURL: https://nyc3.digitaloceanspaces.com destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/gitea/gitea-postgresql-17-cluster endpointCredentials: gitea-postgresql-17-cluster-backup-secret - backupIndex: 1 + backupIndex: 2