diff --git a/clusters/cl01tl/manifests/ephemera/HTTPRoute-ephemera.yaml b/clusters/cl01tl/manifests/ephemera/HTTPRoute-ephemera.yaml new file mode 100644 index 000000000..3f16a6d2f --- /dev/null +++ b/clusters/cl01tl/manifests/ephemera/HTTPRoute-ephemera.yaml @@ -0,0 +1,30 @@ +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: ephemera + labels: + app.kubernetes.io/instance: ephemera + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ephemera + helm.sh/chart: ephemera-4.5.0 + namespace: ephemera +spec: + parentRefs: + - group: gateway.networking.k8s.io + kind: Gateway + name: traefik-gateway + namespace: traefik + hostnames: + - "ephemera.alexlebens.net" + rules: + - backendRefs: + - group: "" + kind: Service + name: ephemera + namespace: ephemera + port: 80 + weight: 100 + matches: + - path: + type: PathPrefix + value: / diff --git a/clusters/cl01tl/manifests/external-dns/DNSEndpoint-cluster-service-names.yaml b/clusters/cl01tl/manifests/external-dns/DNSEndpoint-cluster-service-names.yaml index cd9807fe7..0485536d3 100644 --- a/clusters/cl01tl/manifests/external-dns/DNSEndpoint-cluster-service-names.yaml +++ b/clusters/cl01tl/manifests/external-dns/DNSEndpoint-cluster-service-names.yaml @@ -19,7 +19,7 @@ spec: recordType: A targets: - 10.232.1.22 - - dnsName: plex.alexlebens.net + - dnsName: plex-lb.alexlebens.net recordTTL: 180 recordType: A targets: diff --git a/clusters/cl01tl/manifests/external-dns/DNSEndpoint-iot-device-names.yaml b/clusters/cl01tl/manifests/external-dns/DNSEndpoint-iot-device-names.yaml index bbc144db2..3b1849850 100644 --- a/clusters/cl01tl/manifests/external-dns/DNSEndpoint-iot-device-names.yaml +++ b/clusters/cl01tl/manifests/external-dns/DNSEndpoint-iot-device-names.yaml @@ -29,3 +29,8 @@ spec: recordType: A targets: - 10.232.1.82 + - dnsName: it05sp.alexlebens.net + recordTTL: 180 + recordType: A + targets: + - 10.230.0.100 diff --git a/clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml index abf25beb3..79ffe616e 100644 --- a/clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: freshrss-postgresql-18-cluster namespace: freshrss labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: freshrss-postgresql-18 app.kubernetes.io/instance: freshrss app.kubernetes.io/part-of: freshrss - 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/freshrss/ExternalSecret-freshrss-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/freshrss/ExternalSecret-freshrss-postgresql-18-backup-garage-local-secret.yaml new file mode 100644 index 000000000..c1f8eb2f6 --- /dev/null +++ b/clusters/cl01tl/manifests/freshrss/ExternalSecret-freshrss-postgresql-18-backup-garage-local-secret.yaml @@ -0,0 +1,39 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: freshrss-postgresql-18-backup-garage-local-secret + namespace: freshrss + labels: + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: freshrss-postgresql-18 + app.kubernetes.io/instance: freshrss + app.kubernetes.io/part-of: freshrss + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: freshrss-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/freshrss/ExternalSecret-freshrss-postgresql-18-cluster-backup-secret.yaml b/clusters/cl01tl/manifests/freshrss/ExternalSecret-freshrss-postgresql-18-cluster-backup-secret.yaml deleted file mode 100644 index ff6a1b01f..000000000 --- a/clusters/cl01tl/manifests/freshrss/ExternalSecret-freshrss-postgresql-18-cluster-backup-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: freshrss-postgresql-18-cluster-backup-secret - namespace: freshrss - labels: - app.kubernetes.io/name: freshrss-postgresql-18-cluster-backup-secret - app.kubernetes.io/instance: freshrss - app.kubernetes.io/part-of: freshrss -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/freshrss/ExternalSecret-freshrss-postgresql-18-cluster-backup-secret-garage.yaml b/clusters/cl01tl/manifests/freshrss/ExternalSecret-freshrss-postgresql-18-recovery-secret.yaml similarity index 76% rename from clusters/cl01tl/manifests/freshrss/ExternalSecret-freshrss-postgresql-18-cluster-backup-secret-garage.yaml rename to clusters/cl01tl/manifests/freshrss/ExternalSecret-freshrss-postgresql-18-recovery-secret.yaml index 808ece724..7d41c256f 100644 --- a/clusters/cl01tl/manifests/freshrss/ExternalSecret-freshrss-postgresql-18-cluster-backup-secret-garage.yaml +++ b/clusters/cl01tl/manifests/freshrss/ExternalSecret-freshrss-postgresql-18-recovery-secret.yaml @@ -1,17 +1,28 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: freshrss-postgresql-18-cluster-backup-secret-garage + name: freshrss-postgresql-18-recovery-secret namespace: freshrss labels: - app.kubernetes.io/name: freshrss-postgresql-18-cluster-backup-secret-garage + helm.sh/chart: postgres-18-cluster-7.4.3 + app.kubernetes.io/name: freshrss-postgresql-18 app.kubernetes.io/instance: freshrss app.kubernetes.io/part-of: freshrss + app.kubernetes.io/version: "7.4.3" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: freshrss-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/freshrss/ObjectStore-freshrss-postgresql-18-garage-local-backup.yaml b/clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-backup-garage-local.yaml similarity index 58% rename from clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-garage-local-backup.yaml rename to clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-backup-garage-local.yaml index 297abaf33..fed9ed34b 100644 --- a/clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-garage-local-backup.yaml +++ b/clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-backup-garage-local.yaml @@ -1,27 +1,28 @@ apiVersion: barmancloud.cnpg.io/v1 kind: ObjectStore metadata: - name: "freshrss-postgresql-18-garage-local-backup" + name: freshrss-postgresql-18-backup-garage-local namespace: freshrss labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: freshrss-postgresql-18 app.kubernetes.io/instance: freshrss app.kubernetes.io/part-of: freshrss - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: freshrss-postgresql-18-backup-garage-local spec: - retentionPolicy: 3d + retentionPolicy: 7d configuration: destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 s3Credentials: accessKeyId: - name: freshrss-postgresql-18-cluster-backup-secret-garage + name: freshrss-postgresql-18-backup-garage-local-secret key: ACCESS_KEY_ID secretAccessKey: - name: freshrss-postgresql-18-cluster-backup-secret-garage + name: freshrss-postgresql-18-backup-garage-local-secret key: ACCESS_SECRET_KEY region: - name: freshrss-postgresql-18-cluster-backup-secret-garage + name: freshrss-postgresql-18-backup-garage-local-secret key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-recovery.yaml index 10912971c..acaed8e9a 100644 --- a/clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-recovery.yaml @@ -4,12 +4,13 @@ metadata: name: "freshrss-postgresql-18-recovery" namespace: freshrss labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: freshrss-postgresql-18 app.kubernetes.io/instance: freshrss app.kubernetes.io/part-of: freshrss - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "freshrss-postgresql-18-recovery" spec: configuration: destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster @@ -22,8 +23,11 @@ spec: jobs: 1 s3Credentials: accessKeyId: - name: freshrss-postgresql-18-cluster-backup-secret-garage + name: freshrss-postgresql-18-recovery-secret key: ACCESS_KEY_ID secretAccessKey: - name: freshrss-postgresql-18-cluster-backup-secret-garage + name: freshrss-postgresql-18-recovery-secret key: ACCESS_SECRET_KEY + region: + name: freshrss-postgresql-18-recovery-secret + key: ACCESS_REGION diff --git a/clusters/cl01tl/manifests/freshrss/PrometheusRule-freshrss-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/freshrss/PrometheusRule-freshrss-postgresql-18-alert-rules.yaml index 74a9c1906..a055b1938 100644 --- a/clusters/cl01tl/manifests/freshrss/PrometheusRule-freshrss-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/freshrss/PrometheusRule-freshrss-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: freshrss-postgresql-18-alert-rules namespace: freshrss labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: freshrss-postgresql-18 app.kubernetes.io/instance: freshrss app.kubernetes.io/part-of: freshrss - 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/freshrss/ScheduledBackup-freshrss-postgresql-18-live-backup-scheduled-backup.yaml b/clusters/cl01tl/manifests/freshrss/ScheduledBackup-freshrss-postgresql-18-scheduled-backup-live-backup.yaml similarity index 63% rename from clusters/cl01tl/manifests/freshrss/ScheduledBackup-freshrss-postgresql-18-live-backup-scheduled-backup.yaml rename to clusters/cl01tl/manifests/freshrss/ScheduledBackup-freshrss-postgresql-18-scheduled-backup-live-backup.yaml index 90e43cad7..420d3fc18 100644 --- a/clusters/cl01tl/manifests/freshrss/ScheduledBackup-freshrss-postgresql-18-live-backup-scheduled-backup.yaml +++ b/clusters/cl01tl/manifests/freshrss/ScheduledBackup-freshrss-postgresql-18-scheduled-backup-live-backup.yaml @@ -1,15 +1,16 @@ apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: "freshrss-postgresql-18-live-backup-scheduled-backup" + name: "freshrss-postgresql-18-scheduled-backup-live-backup" namespace: freshrss labels: - helm.sh/chart: postgres-18-cluster-7.1.4 + helm.sh/chart: postgres-18-cluster-7.4.3 app.kubernetes.io/name: freshrss-postgresql-18 app.kubernetes.io/instance: freshrss app.kubernetes.io/part-of: freshrss - app.kubernetes.io/version: "7.1.4" + app.kubernetes.io/version: "7.4.3" app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: "freshrss-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: "freshrss-postgresql-18-garage-local-backup" + barmanObjectName: "freshrss-postgresql-18-backup-garage-local"