From 4aed3852cff72a65bbdc418132db0e346f192ea0 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Tue, 23 Dec 2025 23:42:41 +0000 Subject: [PATCH] chore: Update manifests after change --- .../HTTPRoute-http-route-ephemera.yaml | 28 ------------- ...arage-s3.yaml => HTTPRoute-garage-s3.yaml} | 26 +++++++------ ...webui.yaml => HTTPRoute-garage-webui.yaml} | 26 +++++++------ .../garage/ServiceMonitor-garage.yaml | 25 +++++++----- .../Cluster-gatus-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...s-postgresql-18-cluster-backup-secret.yaml | 28 ------------- ...-gatus-postgresql-18-recovery-secret.yaml} | 22 ++++++----- ...-route-gatus.yaml => HTTPRoute-gatus.yaml} | 4 +- ...us-postgresql-18-backup-garage-local.yaml} | 15 +++---- ...ectStore-gatus-postgresql-18-recovery.yaml | 12 ++++-- ...sRule-gatus-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +++-- .../Cluster-gitea-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...a-postgresql-18-cluster-backup-secret.yaml | 28 ------------- ...-gitea-postgresql-18-recovery-secret.yaml} | 22 ++++++----- ...-route-gitea.yaml => HTTPRoute-gitea.yaml} | 4 +- ...ea-postgresql-18-backup-garage-local.yaml} | 15 +++---- ...ectStore-gitea-postgresql-18-recovery.yaml | 12 ++++-- ...sRule-gitea-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +++-- ...gitea-ssh.yaml => TCPRoute-gitea-ssh.yaml} | 4 +- ...rafana-operator-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...perator-postgresql-18-recovery-secret.yaml | 39 +++++++++++++++++++ ...te-grafana.yaml => HTTPRoute-grafana.yaml} | 4 +- ...or-postgresql-18-backup-garage-local.yaml} | 15 +++---- ...afana-operator-postgresql-18-recovery.yaml | 12 ++++-- ...na-operator-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +++-- .../Cluster-harbor-postgresql-18-cluster.yaml | 4 +- ...tgresql-18-backup-garage-local-secret.yaml | 39 +++++++++++++++++++ ...r-postgresql-18-cluster-backup-secret.yaml | 28 ------------- ...harbor-postgresql-18-recovery-secret.yaml} | 22 ++++++----- ...or-postgresql-18-backup-garage-local.yaml} | 15 +++---- ...ctStore-harbor-postgresql-18-recovery.yaml | 12 ++++-- ...Rule-harbor-postgresql-18-alert-rules.yaml | 4 +- ...esql-18-scheduled-backup-live-backup.yaml} | 9 +++-- ...-headlamp.yaml => HTTPRoute-headlamp.yaml} | 4 +- ...HTTPRoute-home-assistant-code-server.yaml} | 26 +++++++------ ...aml => HTTPRoute-home-assistant-main.yaml} | 26 +++++++------ .../ServiceMonitor-home-assistant.yaml | 25 +++++++----- ...-homepage.yaml => HTTPRoute-homepage.yaml} | 26 +++++++------ 44 files changed, 444 insertions(+), 305 deletions(-) delete mode 100644 clusters/cl01tl/manifests/ephemera/HTTPRoute-http-route-ephemera.yaml rename clusters/cl01tl/manifests/garage/{HTTPRoute-http-route-garage-s3.yaml => HTTPRoute-garage-s3.yaml} (65%) rename clusters/cl01tl/manifests/garage/{HTTPRoute-http-route-garage-webui.yaml => HTTPRoute-garage-webui.yaml} (64%) create mode 100644 clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/gatus/{ExternalSecret-gatus-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-gatus-postgresql-18-recovery-secret.yaml} (76%) rename clusters/cl01tl/manifests/gatus/{HTTPRoute-http-route-gatus.yaml => HTTPRoute-gatus.yaml} (88%) rename clusters/cl01tl/manifests/gatus/{ObjectStore-gatus-postgresql-18-garage-local-backup.yaml => ObjectStore-gatus-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/gatus/{ScheduledBackup-gatus-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-gatus-postgresql-18-scheduled-backup-live-backup.yaml} (63%) create mode 100644 clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/gitea/{ExternalSecret-gitea-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-gitea-postgresql-18-recovery-secret.yaml} (76%) rename clusters/cl01tl/manifests/gitea/{HTTPRoute-http-route-gitea.yaml => HTTPRoute-gitea.yaml} (88%) rename clusters/cl01tl/manifests/gitea/{ObjectStore-gitea-postgresql-18-garage-local-backup.yaml => ObjectStore-gitea-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/gitea/{ScheduledBackup-gitea-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-gitea-postgresql-18-scheduled-backup-live-backup.yaml} (63%) rename clusters/cl01tl/manifests/gitea/{TCPRoute-tcp-route-gitea-ssh.yaml => TCPRoute-gitea-ssh.yaml} (86%) create mode 100644 clusters/cl01tl/manifests/grafana-operator/ExternalSecret-grafana-operator-postgresql-18-backup-garage-local-secret.yaml create mode 100644 clusters/cl01tl/manifests/grafana-operator/ExternalSecret-grafana-operator-postgresql-18-recovery-secret.yaml rename clusters/cl01tl/manifests/grafana-operator/{HTTPRoute-http-route-grafana.yaml => HTTPRoute-grafana.yaml} (89%) rename clusters/cl01tl/manifests/grafana-operator/{ObjectStore-grafana-operator-postgresql-18-garage-local-backup.yaml => ObjectStore-grafana-operator-postgresql-18-backup-garage-local.yaml} (57%) rename clusters/cl01tl/manifests/grafana-operator/{ScheduledBackup-grafana-operator-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-grafana-operator-postgresql-18-scheduled-backup-live-backup.yaml} (64%) create mode 100644 clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-backup-garage-local-secret.yaml delete mode 100644 clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-cluster-backup-secret.yaml rename clusters/cl01tl/manifests/harbor/{ExternalSecret-harbor-postgresql-18-cluster-backup-secret-garage.yaml => ExternalSecret-harbor-postgresql-18-recovery-secret.yaml} (76%) rename clusters/cl01tl/manifests/harbor/{ObjectStore-harbor-postgresql-18-garage-local-backup.yaml => ObjectStore-harbor-postgresql-18-backup-garage-local.yaml} (58%) rename clusters/cl01tl/manifests/harbor/{ScheduledBackup-harbor-postgresql-18-live-backup-scheduled-backup.yaml => ScheduledBackup-harbor-postgresql-18-scheduled-backup-live-backup.yaml} (63%) rename clusters/cl01tl/manifests/headlamp/{HTTPRoute-https-route-headlamp.yaml => HTTPRoute-headlamp.yaml} (88%) rename clusters/cl01tl/manifests/home-assistant/{HTTPRoute-http-route-home-assistant-code-server.yaml => HTTPRoute-home-assistant-code-server.yaml} (61%) rename clusters/cl01tl/manifests/home-assistant/{HTTPRoute-http-route-home-assistant.yaml => HTTPRoute-home-assistant-main.yaml} (62%) rename clusters/cl01tl/manifests/homepage/{HTTPRoute-http-route-homepage.yaml => HTTPRoute-homepage.yaml} (65%) diff --git a/clusters/cl01tl/manifests/ephemera/HTTPRoute-http-route-ephemera.yaml b/clusters/cl01tl/manifests/ephemera/HTTPRoute-http-route-ephemera.yaml deleted file mode 100644 index 097ea16b6..000000000 --- a/clusters/cl01tl/manifests/ephemera/HTTPRoute-http-route-ephemera.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: gateway.networking.k8s.io/v1 -kind: HTTPRoute -metadata: - name: http-route-ephemera - namespace: ephemera - labels: - app.kubernetes.io/name: http-route-ephemera - app.kubernetes.io/instance: ephemera - app.kubernetes.io/part-of: ephemera -spec: - parentRefs: - - group: gateway.networking.k8s.io - kind: Gateway - name: traefik-gateway - namespace: traefik - hostnames: - - ephemera.alexlebens.net - rules: - - matches: - - path: - type: PathPrefix - value: / - backendRefs: - - group: '' - kind: Service - name: ephemera - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/garage/HTTPRoute-http-route-garage-s3.yaml b/clusters/cl01tl/manifests/garage/HTTPRoute-garage-s3.yaml similarity index 65% rename from clusters/cl01tl/manifests/garage/HTTPRoute-http-route-garage-s3.yaml rename to clusters/cl01tl/manifests/garage/HTTPRoute-garage-s3.yaml index 16b0bee58..eb7ec939a 100644 --- a/clusters/cl01tl/manifests/garage/HTTPRoute-http-route-garage-s3.yaml +++ b/clusters/cl01tl/manifests/garage/HTTPRoute-garage-s3.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-garage-s3 - namespace: garage + name: garage-s3 labels: - app.kubernetes.io/name: http-route-garage-s3 app.kubernetes.io/instance: garage - app.kubernetes.io/part-of: garage + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: garage + helm.sh/chart: garage-4.5.0 + namespace: garage spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - garage-s3.alexlebens.net + - "garage-s3.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: garage-main + namespace: garage + port: 3900 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: garage-main - port: 3900 - weight: 100 diff --git a/clusters/cl01tl/manifests/garage/HTTPRoute-http-route-garage-webui.yaml b/clusters/cl01tl/manifests/garage/HTTPRoute-garage-webui.yaml similarity index 64% rename from clusters/cl01tl/manifests/garage/HTTPRoute-http-route-garage-webui.yaml rename to clusters/cl01tl/manifests/garage/HTTPRoute-garage-webui.yaml index 278ace396..40b19af28 100644 --- a/clusters/cl01tl/manifests/garage/HTTPRoute-http-route-garage-webui.yaml +++ b/clusters/cl01tl/manifests/garage/HTTPRoute-garage-webui.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-garage-webui - namespace: garage + name: garage-webui labels: - app.kubernetes.io/name: http-route-garage-webui app.kubernetes.io/instance: garage - app.kubernetes.io/part-of: garage + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: garage + helm.sh/chart: garage-4.5.0 + namespace: garage spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - garage-webui.alexlebens.net + - "garage-webui.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: garage-webui + namespace: garage + port: 3909 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: garage-webui - port: 3909 - weight: 100 diff --git a/clusters/cl01tl/manifests/garage/ServiceMonitor-garage.yaml b/clusters/cl01tl/manifests/garage/ServiceMonitor-garage.yaml index 1fbb8693a..a7a8302dc 100644 --- a/clusters/cl01tl/manifests/garage/ServiceMonitor-garage.yaml +++ b/clusters/cl01tl/manifests/garage/ServiceMonitor-garage.yaml @@ -2,21 +2,26 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: garage - namespace: garage labels: - app.kubernetes.io/name: garage app.kubernetes.io/instance: garage - app.kubernetes.io/part-of: garage + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: garage + helm.sh/chart: garage-4.5.0 + namespace: garage spec: + jobLabel: "garage" + namespaceSelector: + matchNames: + - garage selector: matchLabels: - app.kubernetes.io/name: garage app.kubernetes.io/instance: garage + app.kubernetes.io/name: garage endpoints: - - port: admin - interval: 1m - scrapeTimeout: 30s - path: /metrics - bearerTokenSecret: - name: garage-token-secret + - bearerTokenSecret: key: GARAGE_METRICS_TOKEN + name: garage-token-secret + interval: 1m + path: /metrics + port: admin + scrapeTimeout: 30s diff --git a/clusters/cl01tl/manifests/gatus/Cluster-gatus-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/gatus/Cluster-gatus-postgresql-18-cluster.yaml index e8b27228b..8fd551044 100644 --- a/clusters/cl01tl/manifests/gatus/Cluster-gatus-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/gatus/Cluster-gatus-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: gatus-postgresql-18-cluster namespace: gatus labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: gatus-postgresql-18 app.kubernetes.io/instance: gatus app.kubernetes.io/part-of: gatus - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm spec: instances: 3 diff --git a/clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..ea49bf8a7 --- /dev/null +++ b/clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: gatus-postgresql-18-backup-garage-local-secret + namespace: gatus + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: gatus-postgresql-18 + app.kubernetes.io/instance: gatus + app.kubernetes.io/part-of: gatus + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: gatus-postgresql-18-backup-garage-local-secret +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION + - 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 diff --git a/clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index f8d6a1a87..000000000 --- a/clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: gatus-postgresql-18-cluster-backup-secret - namespace: gatus - labels: - app.kubernetes.io/name: gatus-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: gatus - app.kubernetes.io/part-of: gatus -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/manifests/gatus/ExternalSecret-gatus-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-recovery-secret.yaml index eb8fcf409..4661c1821 100644 --- a/clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/gatus/ExternalSecret-gatus-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: gatus-postgresql-18-cluster-backup-secret-garage + name: gatus-postgresql-18-recovery-secret namespace: gatus labels: - app.kubernetes.io/name: gatus-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: gatus-postgresql-18 app.kubernetes.io/instance: gatus app.kubernetes.io/part-of: gatus + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: gatus-postgresql-18-recovery-secret spec: secretStoreRef: kind: ClusterSecretStore name: vault data: + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION - secretKey: ACCESS_KEY_ID remoteRef: conversionStrategy: Default @@ -26,10 +37,3 @@ spec: 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/manifests/gatus/HTTPRoute-http-route-gatus.yaml b/clusters/cl01tl/manifests/gatus/HTTPRoute-gatus.yaml similarity index 88% rename from clusters/cl01tl/manifests/gatus/HTTPRoute-http-route-gatus.yaml rename to clusters/cl01tl/manifests/gatus/HTTPRoute-gatus.yaml index 45524c1f1..753d4516c 100644 --- a/clusters/cl01tl/manifests/gatus/HTTPRoute-http-route-gatus.yaml +++ b/clusters/cl01tl/manifests/gatus/HTTPRoute-gatus.yaml @@ -1,10 +1,10 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-gatus + name: gatus namespace: gatus labels: - app.kubernetes.io/name: http-route-gatus + app.kubernetes.io/name: gatus app.kubernetes.io/instance: gatus app.kubernetes.io/part-of: gatus spec: diff --git a/clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-backup-garage-local.yaml index cdd87086d..41b4d18ce 100644 --- a/clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "gatus-postgresql-18-garage-local-backup" + name: gatus-postgresql-18-backup-garage-local namespace: gatus labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: gatus-postgresql-18 app.kubernetes.io/instance: gatus app.kubernetes.io/part-of: gatus - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: gatus-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/gatus/gatus-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: gatus-postgresql-18-cluster-backup-secret-garage + name: gatus-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: gatus-postgresql-18-cluster-backup-secret-garage + name: gatus-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: gatus-postgresql-18-cluster-backup-secret-garage + name: gatus-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-recovery.yaml index 86016798d..8947f33dc 100644 --- a/clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "gatus-postgresql-18-recovery" namespace: gatus labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: gatus-postgresql-18 app.kubernetes.io/instance: gatus app.kubernetes.io/part-of: gatus - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "gatus-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/gatus/gatus-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: gatus-postgresql-18-cluster-backup-secret-garage + name: gatus-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: gatus-postgresql-18-cluster-backup-secret-garage + name: gatus-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: gatus-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/gatus/PrometheusRule-gatus-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/gatus/PrometheusRule-gatus-postgresql-18-alert-rules.yaml index e9bfaeaf5..7fc1ccc8d 100644 --- a/clusters/cl01tl/manifests/gatus/PrometheusRule-gatus-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/gatus/PrometheusRule-gatus-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: gatus-postgresql-18-alert-rules namespace: gatus labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: gatus-postgresql-18 app.kubernetes.io/instance: gatus app.kubernetes.io/part-of: gatus - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm spec: groups: diff --git a/clusters/cl01tl/manifests/gatus/ScheduledBackup-gatus-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/gatus/ScheduledBackup-gatus-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/gatus/ScheduledBackup-gatus-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/gatus/ScheduledBackup-gatus-postgresql-18-scheduled-backup-live-backup.yaml index 1cf21946a..cf7b70321 100644 --- a/clusters/cl01tl/manifests/gatus/ScheduledBackup-gatus-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/gatus/ScheduledBackup-gatus-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "gatus-postgresql-18-live-backup-scheduled-backup" + name: "gatus-postgresql-18-scheduled-backup-live-backup" namespace: gatus labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: gatus-postgresql-18 app.kubernetes.io/instance: gatus app.kubernetes.io/part-of: gatus - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "gatus-postgresql-18-scheduled-backup-live-backup" spec: immediate: true suspend: false @@ -21,4 +22,4 @@ spec: pluginConfiguration: name: barman-cloud.cloudnative-pg.io parameters: - barmanObjectName: "gatus-postgresql-18-garage-local-backup" + barmanObjectName: "gatus-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/gitea/Cluster-gitea-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/gitea/Cluster-gitea-postgresql-18-cluster.yaml index 0487eb31c..754c73aa5 100644 --- a/clusters/cl01tl/manifests/gitea/Cluster-gitea-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/gitea/Cluster-gitea-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: gitea-postgresql-18-cluster namespace: gitea labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: gitea-postgresql-18 app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm spec: instances: 3 diff --git a/clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..02246f606 --- /dev/null +++ b/clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: gitea-postgresql-18-backup-garage-local-secret + namespace: gitea + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: gitea-postgresql-18 + app.kubernetes.io/instance: gitea + app.kubernetes.io/part-of: gitea + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: gitea-postgresql-18-backup-garage-local-secret +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION + - 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 diff --git a/clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 829894278..000000000 --- a/clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: gitea-postgresql-18-cluster-backup-secret - namespace: gitea - labels: - app.kubernetes.io/name: gitea-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: gitea - app.kubernetes.io/part-of: gitea -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/manifests/gitea/ExternalSecret-gitea-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-recovery-secret.yaml index 060af2f89..769fa54d3 100644 --- a/clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/gitea/ExternalSecret-gitea-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: gitea-postgresql-18-cluster-backup-secret-garage + name: gitea-postgresql-18-recovery-secret namespace: gitea labels: - app.kubernetes.io/name: gitea-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: gitea-postgresql-18 app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: gitea-postgresql-18-recovery-secret spec: secretStoreRef: kind: ClusterSecretStore name: vault data: + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION - secretKey: ACCESS_KEY_ID remoteRef: conversionStrategy: Default @@ -26,10 +37,3 @@ spec: 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/manifests/gitea/HTTPRoute-http-route-gitea.yaml b/clusters/cl01tl/manifests/gitea/HTTPRoute-gitea.yaml similarity index 88% rename from clusters/cl01tl/manifests/gitea/HTTPRoute-http-route-gitea.yaml rename to clusters/cl01tl/manifests/gitea/HTTPRoute-gitea.yaml index 06a28942c..b60277480 100644 --- a/clusters/cl01tl/manifests/gitea/HTTPRoute-http-route-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/HTTPRoute-gitea.yaml @@ -1,10 +1,10 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-gitea + name: gitea namespace: gitea labels: - app.kubernetes.io/name: http-route-gitea + app.kubernetes.io/name: gitea app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea spec: diff --git a/clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-backup-garage-local.yaml index 4bc9a6daa..2d0ecd7b5 100644 --- a/clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "gitea-postgresql-18-garage-local-backup" + name: gitea-postgresql-18-backup-garage-local namespace: gitea labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: gitea-postgresql-18 app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: gitea-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/gitea/gitea-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: gitea-postgresql-18-cluster-backup-secret-garage + name: gitea-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: gitea-postgresql-18-cluster-backup-secret-garage + name: gitea-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: gitea-postgresql-18-cluster-backup-secret-garage + name: gitea-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-recovery.yaml index 4acb25dc5..7831752e4 100644 --- a/clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "gitea-postgresql-18-recovery" namespace: gitea labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: gitea-postgresql-18 app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "gitea-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/gitea/gitea-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: gitea-postgresql-18-cluster-backup-secret-garage + name: gitea-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: gitea-postgresql-18-cluster-backup-secret-garage + name: gitea-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: gitea-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/gitea/PrometheusRule-gitea-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/gitea/PrometheusRule-gitea-postgresql-18-alert-rules.yaml index 808850f6d..b9817593e 100644 --- a/clusters/cl01tl/manifests/gitea/PrometheusRule-gitea-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/gitea/PrometheusRule-gitea-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: gitea-postgresql-18-alert-rules namespace: gitea labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: gitea-postgresql-18 app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm spec: groups: diff --git a/clusters/cl01tl/manifests/gitea/ScheduledBackup-gitea-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/gitea/ScheduledBackup-gitea-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/gitea/ScheduledBackup-gitea-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/gitea/ScheduledBackup-gitea-postgresql-18-scheduled-backup-live-backup.yaml index dd44f2845..7f9310fea 100644 --- a/clusters/cl01tl/manifests/gitea/ScheduledBackup-gitea-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/gitea/ScheduledBackup-gitea-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "gitea-postgresql-18-live-backup-scheduled-backup" + name: "gitea-postgresql-18-scheduled-backup-live-backup" namespace: gitea labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: gitea-postgresql-18 app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "gitea-postgresql-18-scheduled-backup-live-backup" spec: immediate: true suspend: false @@ -21,4 +22,4 @@ spec: pluginConfiguration: name: barman-cloud.cloudnative-pg.io parameters: - barmanObjectName: "gitea-postgresql-18-garage-local-backup" + barmanObjectName: "gitea-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/gitea/TCPRoute-tcp-route-gitea-ssh.yaml b/clusters/cl01tl/manifests/gitea/TCPRoute-gitea-ssh.yaml similarity index 86% rename from clusters/cl01tl/manifests/gitea/TCPRoute-tcp-route-gitea-ssh.yaml rename to clusters/cl01tl/manifests/gitea/TCPRoute-gitea-ssh.yaml index 0c685b983..af6241167 100644 --- a/clusters/cl01tl/manifests/gitea/TCPRoute-tcp-route-gitea-ssh.yaml +++ b/clusters/cl01tl/manifests/gitea/TCPRoute-gitea-ssh.yaml @@ -1,10 +1,10 @@ apiVersion: gateway.networking.k8s.io/v1alpha2 kind: TCPRoute metadata: - name: tcp-route-gitea-ssh + name: gitea-ssh namespace: gitea labels: - app.kubernetes.io/name: tcp-route-gitea-ssh + app.kubernetes.io/name: gitea-ssh app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea spec: diff --git a/clusters/cl01tl/manifests/grafana-operator/Cluster-grafana-operator-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/grafana-operator/Cluster-grafana-operator-postgresql-18-cluster.yaml index 7c116a858..4877047f4 100644 --- a/clusters/cl01tl/manifests/grafana-operator/Cluster-grafana-operator-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/Cluster-grafana-operator-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: grafana-operator-postgresql-18-cluster namespace: grafana-operator labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: grafana-operator-postgresql-18 app.kubernetes.io/instance: grafana-operator app.kubernetes.io/part-of: grafana-operator - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm spec: instances: 3 diff --git a/clusters/cl01tl/manifests/grafana-operator/ExternalSecret-grafana-operator-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/grafana-operator/ExternalSecret-grafana-operator-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..f8a539b42 --- /dev/null +++ b/clusters/cl01tl/manifests/grafana-operator/ExternalSecret-grafana-operator-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: grafana-operator-postgresql-18-backup-garage-local-secret + namespace: grafana-operator + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: grafana-operator-postgresql-18 + app.kubernetes.io/instance: grafana-operator + app.kubernetes.io/part-of: grafana-operator + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: grafana-operator-postgresql-18-backup-garage-local-secret +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION + - 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 diff --git a/clusters/cl01tl/manifests/grafana-operator/ExternalSecret-grafana-operator-postgresql-18-recovery-secret.yaml b/clusters/cl01tl/manifests/grafana-operator/ExternalSecret-grafana-operator-postgresql-18-recovery-secret.yaml new file mode 100644 index 000000000..7e811fe6e --- /dev/null +++ b/clusters/cl01tl/manifests/grafana-operator/ExternalSecret-grafana-operator-postgresql-18-recovery-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: grafana-operator-postgresql-18-recovery-secret + namespace: grafana-operator + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: grafana-operator-postgresql-18 + app.kubernetes.io/instance: grafana-operator + app.kubernetes.io/part-of: grafana-operator + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: grafana-operator-postgresql-18-recovery-secret +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION + - 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 diff --git a/clusters/cl01tl/manifests/grafana-operator/HTTPRoute-http-route-grafana.yaml b/clusters/cl01tl/manifests/grafana-operator/HTTPRoute-grafana.yaml similarity index 89% rename from clusters/cl01tl/manifests/grafana-operator/HTTPRoute-http-route-grafana.yaml rename to clusters/cl01tl/manifests/grafana-operator/HTTPRoute-grafana.yaml index b6d010acc..93b313745 100644 --- a/clusters/cl01tl/manifests/grafana-operator/HTTPRoute-http-route-grafana.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/HTTPRoute-grafana.yaml @@ -1,10 +1,10 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-grafana + name: grafana namespace: grafana-operator labels: - app.kubernetes.io/name: http-route-grafana + app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana-operator app.kubernetes.io/part-of: grafana-operator spec: diff --git a/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-backup-garage-local.yaml similarity index 57% rename from clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-backup-garage-local.yaml index bb540ae3a..490eddb86 100644 --- a/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "grafana-operator-postgresql-18-garage-local-backup" + name: grafana-operator-postgresql-18-backup-garage-local namespace: grafana-operator labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: grafana-operator-postgresql-18 app.kubernetes.io/instance: grafana-operator app.kubernetes.io/part-of: grafana-operator - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: grafana-operator-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: grafana-operator-postgresql-18-cluster-backup-secret-garage + name: grafana-operator-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: grafana-operator-postgresql-18-cluster-backup-secret-garage + name: grafana-operator-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: grafana-operator-postgresql-18-cluster-backup-secret-garage + name: grafana-operator-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-recovery.yaml index 4d8707d04..31aba8d76 100644 --- a/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "grafana-operator-postgresql-18-recovery" namespace: grafana-operator labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: grafana-operator-postgresql-18 app.kubernetes.io/instance: grafana-operator app.kubernetes.io/part-of: grafana-operator - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "grafana-operator-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: grafana-operator-postgresql-18-cluster-backup-secret-garage + name: grafana-operator-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: grafana-operator-postgresql-18-cluster-backup-secret-garage + name: grafana-operator-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: grafana-operator-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/grafana-operator/PrometheusRule-grafana-operator-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/grafana-operator/PrometheusRule-grafana-operator-postgresql-18-alert-rules.yaml index 5b8e0eb3a..4f1a9a3f9 100644 --- a/clusters/cl01tl/manifests/grafana-operator/PrometheusRule-grafana-operator-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/PrometheusRule-grafana-operator-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: grafana-operator-postgresql-18-alert-rules namespace: grafana-operator labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: grafana-operator-postgresql-18 app.kubernetes.io/instance: grafana-operator app.kubernetes.io/part-of: grafana-operator - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm spec: groups: diff --git a/clusters/cl01tl/manifests/grafana-operator/ScheduledBackup-grafana-operator-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/grafana-operator/ScheduledBackup-grafana-operator-postgresql-18-scheduled-backup-live-backup.yaml similarity index 64% rename from clusters/cl01tl/manifests/grafana-operator/ScheduledBackup-grafana-operator-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/grafana-operator/ScheduledBackup-grafana-operator-postgresql-18-scheduled-backup-live-backup.yaml index 87a0796d1..23bbcdacd 100644 --- a/clusters/cl01tl/manifests/grafana-operator/ScheduledBackup-grafana-operator-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/ScheduledBackup-grafana-operator-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "grafana-operator-postgresql-18-live-backup-scheduled-backup" + name: "grafana-operator-postgresql-18-scheduled-backup-live-backup" namespace: grafana-operator labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: grafana-operator-postgresql-18 app.kubernetes.io/instance: grafana-operator app.kubernetes.io/part-of: grafana-operator - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "grafana-operator-postgresql-18-scheduled-backup-live-backup" spec: immediate: true suspend: false @@ -21,4 +22,4 @@ spec: pluginConfiguration: name: barman-cloud.cloudnative-pg.io parameters: - barmanObjectName: "grafana-operator-postgresql-18-garage-local-backup" + barmanObjectName: "grafana-operator-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/harbor/Cluster-harbor-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/harbor/Cluster-harbor-postgresql-18-cluster.yaml index 68484e321..90ed5e343 100644 --- a/clusters/cl01tl/manifests/harbor/Cluster-harbor-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/harbor/Cluster-harbor-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: harbor-postgresql-18-cluster namespace: harbor labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: harbor-postgresql-18 app.kubernetes.io/instance: harbor app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm spec: instances: 3 diff --git a/clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..81929687f --- /dev/null +++ b/clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: harbor-postgresql-18-backup-garage-local-secret + namespace: harbor + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: harbor-postgresql-18 + app.kubernetes.io/instance: harbor + app.kubernetes.io/part-of: harbor + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: harbor-postgresql-18-backup-garage-local-secret +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION + - 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 diff --git a/clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index 8ccca5dff..000000000 --- a/clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: harbor-postgresql-18-cluster-backup-secret - namespace: harbor - labels: - app.kubernetes.io/name: harbor-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: harbor - app.kubernetes.io/part-of: harbor -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/manifests/harbor/ExternalSecret-harbor-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-recovery-secret.yaml index 9e21bfbff..7ddc4e5a7 100644 --- a/clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/harbor/ExternalSecret-harbor-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: harbor-postgresql-18-cluster-backup-secret-garage + name: harbor-postgresql-18-recovery-secret namespace: harbor labels: - app.kubernetes.io/name: harbor-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: harbor-postgresql-18 app.kubernetes.io/instance: harbor app.kubernetes.io/part-of: harbor + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: harbor-postgresql-18-recovery-secret spec: secretStoreRef: kind: ClusterSecretStore name: vault data: + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION - secretKey: ACCESS_KEY_ID remoteRef: conversionStrategy: Default @@ -26,10 +37,3 @@ spec: 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/manifests/harbor/ObjectStore-harbor-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-backup-garage-local.yaml index ba6b54da2..5c08de7bd 100644 --- a/clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "harbor-postgresql-18-garage-local-backup" + name: harbor-postgresql-18-backup-garage-local namespace: harbor labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: harbor-postgresql-18 app.kubernetes.io/instance: harbor app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: harbor-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/harbor/harbor-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: harbor-postgresql-18-cluster-backup-secret-garage + name: harbor-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: harbor-postgresql-18-cluster-backup-secret-garage + name: harbor-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: harbor-postgresql-18-cluster-backup-secret-garage + name: harbor-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-recovery.yaml index 0b38678f5..a170de888 100644 --- a/clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "harbor-postgresql-18-recovery" namespace: harbor labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: harbor-postgresql-18 app.kubernetes.io/instance: harbor app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "harbor-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/harbor/harbor-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: harbor-postgresql-18-cluster-backup-secret-garage + name: harbor-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: harbor-postgresql-18-cluster-backup-secret-garage + name: harbor-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: harbor-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/harbor/PrometheusRule-harbor-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/harbor/PrometheusRule-harbor-postgresql-18-alert-rules.yaml index e0e9eb3b4..8f501aee6 100644 --- a/clusters/cl01tl/manifests/harbor/PrometheusRule-harbor-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/harbor/PrometheusRule-harbor-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: harbor-postgresql-18-alert-rules namespace: harbor labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: harbor-postgresql-18 app.kubernetes.io/instance: harbor app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm spec: groups: diff --git a/clusters/cl01tl/manifests/harbor/ScheduledBackup-harbor-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/harbor/ScheduledBackup-harbor-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/harbor/ScheduledBackup-harbor-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/harbor/ScheduledBackup-harbor-postgresql-18-scheduled-backup-live-backup.yaml index b87724d62..5b453ec0b 100644 --- a/clusters/cl01tl/manifests/harbor/ScheduledBackup-harbor-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/harbor/ScheduledBackup-harbor-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "harbor-postgresql-18-live-backup-scheduled-backup" + name: "harbor-postgresql-18-scheduled-backup-live-backup" namespace: harbor labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: harbor-postgresql-18 app.kubernetes.io/instance: harbor app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "harbor-postgresql-18-scheduled-backup-live-backup" spec: immediate: true suspend: false @@ -21,4 +22,4 @@ spec: pluginConfiguration: name: barman-cloud.cloudnative-pg.io parameters: - barmanObjectName: "harbor-postgresql-18-garage-local-backup" + barmanObjectName: "harbor-postgresql-18-backup-garage-local" diff --git a/clusters/cl01tl/manifests/headlamp/HTTPRoute-https-route-headlamp.yaml b/clusters/cl01tl/manifests/headlamp/HTTPRoute-headlamp.yaml similarity index 88% rename from clusters/cl01tl/manifests/headlamp/HTTPRoute-https-route-headlamp.yaml rename to clusters/cl01tl/manifests/headlamp/HTTPRoute-headlamp.yaml index d03fc056f..3444365bb 100644 --- a/clusters/cl01tl/manifests/headlamp/HTTPRoute-https-route-headlamp.yaml +++ b/clusters/cl01tl/manifests/headlamp/HTTPRoute-headlamp.yaml @@ -1,10 +1,10 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: https-route-headlamp + name: headlamp namespace: headlamp labels: - app.kubernetes.io/name: https-route-headlamp + app.kubernetes.io/name: headlamp app.kubernetes.io/instance: headlamp app.kubernetes.io/part-of: headlamp spec: diff --git a/clusters/cl01tl/manifests/home-assistant/HTTPRoute-http-route-home-assistant-code-server.yaml b/clusters/cl01tl/manifests/home-assistant/HTTPRoute-home-assistant-code-server.yaml similarity index 61% rename from clusters/cl01tl/manifests/home-assistant/HTTPRoute-http-route-home-assistant-code-server.yaml rename to clusters/cl01tl/manifests/home-assistant/HTTPRoute-home-assistant-code-server.yaml index b4a063d4e..14da2925a 100644 --- a/clusters/cl01tl/manifests/home-assistant/HTTPRoute-http-route-home-assistant-code-server.yaml +++ b/clusters/cl01tl/manifests/home-assistant/HTTPRoute-home-assistant-code-server.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-home-assistant-code-server - namespace: home-assistant + name: home-assistant-code-server labels: - app.kubernetes.io/name: http-route-home-assistant-code-server app.kubernetes.io/instance: home-assistant - app.kubernetes.io/part-of: home-assistant + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: home-assistant + helm.sh/chart: home-assistant-4.5.0 + namespace: home-assistant spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - home-assistant-code-server.alexlebens.net + - "home-assistant-code-server.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: home-assistant-code-server + namespace: home-assistant + port: 8443 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: home-assistant-code-server - port: 8443 - weight: 100 diff --git a/clusters/cl01tl/manifests/home-assistant/HTTPRoute-http-route-home-assistant.yaml b/clusters/cl01tl/manifests/home-assistant/HTTPRoute-home-assistant-main.yaml similarity index 62% rename from clusters/cl01tl/manifests/home-assistant/HTTPRoute-http-route-home-assistant.yaml rename to clusters/cl01tl/manifests/home-assistant/HTTPRoute-home-assistant-main.yaml index 94606e68d..061f90728 100644 --- a/clusters/cl01tl/manifests/home-assistant/HTTPRoute-http-route-home-assistant.yaml +++ b/clusters/cl01tl/manifests/home-assistant/HTTPRoute-home-assistant-main.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-home-assistant - namespace: home-assistant + name: home-assistant-main labels: - app.kubernetes.io/name: http-route-home-assistant app.kubernetes.io/instance: home-assistant - app.kubernetes.io/part-of: home-assistant + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: home-assistant + helm.sh/chart: home-assistant-4.5.0 + namespace: home-assistant spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - home-assistant.alexlebens.net + - "home-assistant.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: home-assistant-main + namespace: home-assistant + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: home-assistant-main - port: 80 - weight: 100 diff --git a/clusters/cl01tl/manifests/home-assistant/ServiceMonitor-home-assistant.yaml b/clusters/cl01tl/manifests/home-assistant/ServiceMonitor-home-assistant.yaml index 36e5d9437..7ede144e6 100644 --- a/clusters/cl01tl/manifests/home-assistant/ServiceMonitor-home-assistant.yaml +++ b/clusters/cl01tl/manifests/home-assistant/ServiceMonitor-home-assistant.yaml @@ -2,22 +2,27 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: home-assistant - namespace: home-assistant labels: - app.kubernetes.io/name: home-assistant app.kubernetes.io/instance: home-assistant - app.kubernetes.io/part-of: home-assistant + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: home-assistant + helm.sh/chart: home-assistant-4.5.0 + namespace: home-assistant spec: + jobLabel: "home-assistant" + namespaceSelector: + matchNames: + - home-assistant selector: matchLabels: + app.kubernetes.io/instance: home-assistant app.kubernetes.io/name: home-assistant app.kubernetes.io/service: home-assistant-main - app.kubernetes.io/instance: home-assistant endpoints: - - port: http - interval: 3m - scrapeTimeout: 1m - path: /api/prometheus - bearerTokenSecret: - name: home-assistant-token-secret + - bearerTokenSecret: key: bearer-token + name: home-assistant-token-secret + interval: 3m + path: /api/prometheus + port: http + scrapeTimeout: 1m diff --git a/clusters/cl01tl/manifests/homepage/HTTPRoute-http-route-homepage.yaml b/clusters/cl01tl/manifests/homepage/HTTPRoute-homepage.yaml similarity index 65% rename from clusters/cl01tl/manifests/homepage/HTTPRoute-http-route-homepage.yaml rename to clusters/cl01tl/manifests/homepage/HTTPRoute-homepage.yaml index b854d7916..4ff7989ac 100644 --- a/clusters/cl01tl/manifests/homepage/HTTPRoute-http-route-homepage.yaml +++ b/clusters/cl01tl/manifests/homepage/HTTPRoute-homepage.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: http-route-homepage - namespace: homepage + name: homepage labels: - app.kubernetes.io/name: http-route-homepage app.kubernetes.io/instance: homepage - app.kubernetes.io/part-of: homepage + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: homepage + helm.sh/chart: homepage-4.5.0 + namespace: homepage spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - home.alexlebens.net + - "home.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: homepage + namespace: homepage + port: 80 + weight: 100 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: homepage - port: 80 - weight: 100