commit 64078b4294bb20266155256e7f44546db41be42d parent a997f9222b0aa84c59d9677e91e693214d492aff Author: MTRNord <mtrnord1@gmail.com> Date: Wed, 1 May 2024 12:41:10 +0200 general fixes Diffstat:
53 files changed, 162 insertions(+), 49 deletions(-)
diff --git a/apps/base/authentik/release.yaml b/apps/base/authentik/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: authentik diff --git a/apps/base/calendar/release.yaml b/apps/base/calendar/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: radicale diff --git a/apps/base/chaosmesh/release.yaml b/apps/base/chaosmesh/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: chaosmesh diff --git a/apps/base/cosign/release.yaml b/apps/base/cosign/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: cosign diff --git a/apps/base/ejabberd/kustomization.yaml b/apps/base/ejabberd/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: ejabberd +resources: + - repository.yaml + - release.yaml + # TODO: This REQUIRES https://github.com/sando38/helm-ejabberd/blob/main/charts/ejabberd/README.md#domain-tls-certificates-and-acme-client + # Which is kinda blocked behind https://github.com/kubernetes/kops/issues/16498 + - ssl.yaml diff --git a/apps/base/ejabberd/release.yaml b/apps/base/ejabberd/release.yaml @@ -0,0 +1,68 @@ +apiVersion: helm.toolkit.fluxcd.io/v2beta2 +kind: HelmRelease +metadata: + name: ejabberd + namespace: ejabberd +spec: + releaseName: ejabberd + chart: + spec: + chart: ejabberd + sourceRef: + kind: HelmRepository + name: ejabberd + values: + sqlDatabase: + enabled: true + updateSqlSchema: true + config: + ssl_type: pgsql + ssl_server: postgres-cluster.postgres-cluster.svc.cluster.local + sql_port: 5432 + sql_ssl: true + sql_database: ejabberd + sql_username: ejabberd + # TODO: + sql_password: ENC[AES256_GCM,data:FNXCNt75slk=,iv:HS7g8MYQbbg+BsX7mlMtqCtlNmOa+AdJzwVkkTbRkXc=,tag:OyOEzAmO46rStFdGsbQceA==,type:str] + certFiles: + secretName: + - xmpp-midnightthoughts + sideCar: + enabled: true + authentification: + auth_method: + - sql + auth_password_format: scram + auth_scram_hash: sha256 + disable_sasl_mechanisms: + - digest-md5 + - x-oauth2 + hosts: + - localhost + - xmpp.midnightthoughts.space + erlangCookie: ENC[AES256_GCM,data:SH8h3dEcJ+ZYAPrqc8akDYW/hC87vjb+L/8SZbha0VoO2hgu9PZmBVk/l+3uw5ZC0E7vLla6rIotQcWw/qqd1w==,iv:DPGHGIrnPzAi6jFFyAf7+USrT7Y7aJP8l1GgwP/OFN8=,tag:0xMXz1BbGk5ePcP9xfOo1w==,type:str] + service: + annotations: + load-balancer.hetzner.cloud/location: fsn1 + load-balancer.hetzner.cloud/use-private-ip: "true" + load-balancer.hetzner.cloud/name: traefik +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrNFBML3NyWmxaVTlNYzVV + cmp4cGdSWGYzN3hkQnBYVUwvM2Z1anRoNTNrCnlsa05kOWtPRXIzRm04OTZqT1N0 + UUU5UUdhVzZ6VEdyYkE1V25kUjNWYlEKLS0tIFhyVi9ON05aZXBnWWd2cGZpbDRE + ck9PeHlQU1ZsZWZTd3NFdDN4MUo5WkkKQcENla/Iliif2PyhWw4X0kXUQj9uj4a+ + iWo+4QJ/A1rxjIdfiRdytjhP8KdfysY2qw482yUD6IEAAVwlJLnmBw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-04-27T18:28:46Z" + mac: ENC[AES256_GCM,data:GC9sG7jtP45C7I/cRVL7bLLFGeCytimC1U8HwY3X0ZinZjEeYooekVcT9NIP+hWTrhOUx4Ud0q4sX9g733E376kakq2np3iCGRcDKHzF95sXfRQJuiveVkUNRdsYapeNC/fUETp4e07lspVuwxGFvGgviOuzFQBnPnqywpW40yA=,iv:7C/LFsPv8YycnDpFfKXgZA+s6lCQ0f1OcfzPSlGEtWI=,tag:Ir3ZBXMjvwDF0FVwoehdUw==,type:str] + pgp: [] + encrypted_regex: ^(sql_password|erlangCookie|PASSWD|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|adminPassword|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret)$ + version: 3.8.1 diff --git a/apps/base/ejabberd/repository.yaml b/apps/base/ejabberd/repository.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: ejabberd + namespace: ejabberd +spec: + interval: 5m + url: https://sando38.github.io/helm-ejabberd diff --git a/apps/base/ejabberd/ssl.yaml b/apps/base/ejabberd/ssl.yaml @@ -0,0 +1,27 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: xmpp-midnightthoughts + namespace: ejabberd +spec: + secretName: xmpp-midnightthoughts + privateKey: + rotationPolicy: Always + issuerRef: + name: letsencrypt-http + kind: ClusterIssuer + commonName: "xmpp.midnightthoughts.space" + dnsNames: + - "xmpp.midnightthoughts.space" + - "conference.xmpp.midnightthoughts.space" + - "proxy.xmpp.midnightthoughts.space" + - "upload.xmpp.midnightthoughts.space" + - "vjud.xmpp.midnightthoughts.space" + additionalOutputFormats: + - type: CombinedPEM + - type: DER + secretTemplate: + annotations: + k8s-sidecar-target-directory: "certs/xmpp-midnightthoughts" + labels: + helm-ejabberd/watcher: "true" diff --git a/apps/base/forgejo/release.yaml b/apps/base/forgejo/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: forgejo diff --git a/apps/base/keycloak/release.yaml b/apps/base/keycloak/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: keycloak diff --git a/apps/base/kube-prometheus-stack/release.yaml b/apps/base/kube-prometheus-stack/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: kube-prometheus diff --git a/apps/base/loki-stack/release.yaml b/apps/base/loki-stack/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: loki-stack diff --git a/apps/base/mailu/release.yaml b/apps/base/mailu/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: mailu diff --git a/apps/base/matrix/draupnir-synapse/dragonfly.yaml b/apps/base/matrix/draupnir-synapse/dragonfly.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: draupnir-dragonfly diff --git a/apps/base/matrix/draupnir-synapse/release.yaml b/apps/base/matrix/draupnir-synapse/release.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: draupnir-synapse diff --git a/apps/base/matrix/element-call-synapse/release.yaml b/apps/base/matrix/element-call-synapse/release.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: element-call-synapse diff --git a/apps/base/matrix/element-call/release.yaml b/apps/base/matrix/element-call/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: element-call diff --git a/apps/base/matrix/media-repo/release.yaml b/apps/base/matrix/media-repo/release.yaml @@ -17,7 +17,7 @@ spec: storage: 16Gi storageClassName: nfs-client --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: matrix-media-repo diff --git a/apps/base/matrix/synapse/dragonfly.yaml b/apps/base/matrix/synapse/dragonfly.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: dragonfly diff --git a/apps/base/matrix/synapse/release.yaml b/apps/base/matrix/synapse/release.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: matrix-synapse diff --git a/apps/base/n8n/release.yaml b/apps/base/n8n/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: n8n diff --git a/apps/base/openldap/release.yaml b/apps/base/openldap/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: openldap diff --git a/apps/base/openproject/release.yaml b/apps/base/openproject/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: openproject diff --git a/apps/base/parseable/release.yaml b/apps/base/parseable/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: parseable diff --git a/apps/base/piwigo/release.yaml b/apps/base/piwigo/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: piwigo diff --git a/apps/base/postgres-exporter/release.yaml b/apps/base/postgres-exporter/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: postgres-exporter diff --git a/apps/base/redmine/release.yaml b/apps/base/redmine/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: redmine diff --git a/apps/base/rook/release.yaml b/apps/base/rook/release.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: rook-ceph diff --git a/apps/base/tempo/release.yaml b/apps/base/tempo/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: tempo diff --git a/apps/base/tetragon/release.yaml b/apps/base/tetragon/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: tetragon diff --git a/apps/base/vaultwarden/release.yaml b/apps/base/vaultwarden/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: vaultwarden diff --git a/apps/base/vector/release.yaml b/apps/base/vector/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: vector diff --git a/apps/base/woodpecker/release.yaml b/apps/base/woodpecker/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: woodpecker diff --git a/apps/base/workadventure/release.yaml b/apps/base/workadventure/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: workadventure diff --git a/apps/base/zammad/release.yaml b/apps/base/zammad/release.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: zammad diff --git a/apps/production/cosign-values.yaml b/apps/production/cosign-values.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: cosign diff --git a/apps/production/forgejo.yaml b/apps/production/forgejo.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: forgejo diff --git a/apps/production/loki-stack-values.yaml b/apps/production/loki-stack-values.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: loki-stack diff --git a/apps/production/mailu-values.yaml b/apps/production/mailu-values.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: mailu diff --git a/apps/production/media-repo-values.yaml b/apps/production/media-repo-values.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: matrix-media-repo diff --git a/apps/production/openproject-values.yaml b/apps/production/openproject-values.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: openproject diff --git a/apps/production/postgres-exporter-values.yaml b/apps/production/postgres-exporter-values.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: postgres-exporter diff --git a/apps/production/redmine-values.yaml b/apps/production/redmine-values.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: redmine diff --git a/apps/production/synapse-draupnir.yaml b/apps/production/synapse-draupnir.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: draupnir-synapse diff --git a/apps/production/synapse-element-call.yaml b/apps/production/synapse-element-call.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: element-call-synapse diff --git a/apps/production/synapse-midnightthoughts.yaml b/apps/production/synapse-midnightthoughts.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: matrix-synapse diff --git a/apps/production/vaultwarden-values.yaml b/apps/production/vaultwarden-values.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: vaultwarden diff --git a/apps/production/vector-values.yaml b/apps/production/vector-values.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: vector diff --git a/apps/production/woodpecker-values.yaml b/apps/production/woodpecker-values.yaml @@ -1,4 +1,4 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: woodpecker diff --git a/infrastructure_old/controllers/cert-manager.yaml b/infrastructure_old/controllers/cert-manager.yaml @@ -13,7 +13,7 @@ spec: interval: 24h url: https://charts.jetstack.io --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: cert-manager diff --git a/infrastructure_old/controllers/descheduler.yaml b/infrastructure_old/controllers/descheduler.yaml @@ -13,7 +13,7 @@ spec: interval: 24h url: https://kubernetes-sigs.github.io/descheduler/ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: descheduler diff --git a/infrastructure_old/controllers/metallb.yaml b/infrastructure_old/controllers/metallb.yaml @@ -13,7 +13,7 @@ spec: interval: 24h url: https://metallb.github.io/metallb --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: metallb diff --git a/infrastructure_old/controllers/weave-gitops.yaml b/infrastructure_old/controllers/weave-gitops.yaml @@ -9,7 +9,7 @@ spec: interval: 60m0s url: oci://ghcr.io/weaveworks/charts --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: weave-gitops