diff --git a/templates/ai-openweb.yaml b/templates/ai-openweb.yaml index e2c52ea..7ff23de 100644 --- a/templates/ai-openweb.yaml +++ b/templates/ai-openweb.yaml @@ -1,14 +1,9 @@ --- -apiVersion: v1 -kind: Namespace -metadata: - name: ai ---- apiVersion: apps/v1 kind: Deployment metadata: name: openwebui - namespace: ai + namespace: {{ .Release.Namespace }} spec: replicas: 1 selector: @@ -40,7 +35,7 @@ apiVersion: v1 kind: Service metadata: name: openwebui - namespace: ai + namespace: {{ .Release.Namespace }} spec: selector: app: openwebui @@ -53,7 +48,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: openwebui - namespace: ai + namespace: {{ .Release.Namespace }} annotations: kubernetes.io/ingress.class: "traefik" external-dns.alpha.kubernetes.io/hostname: nc.hxme.net diff --git a/templates/auth-authentik.yaml b/templates/auth-authentik.yaml index ced40ed..c2a6f4e 100644 --- a/templates/auth-authentik.yaml +++ b/templates/auth-authentik.yaml @@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: authentik - namespace: flux-system + namespace: {{ .Release.Namespace }} spec: url: https://charts.goauthentik.io/ interval: 1h @@ -17,7 +17,7 @@ apiVersion: v1 kind: Secret metadata: name: wildcard-hxme-net - namespace: authentik + namespace: {{ .Release.Namespace }} annotations: replicator.v1.mittwald.de/replicate-from: cert-manager/wildcard-hxme-net --- @@ -25,7 +25,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: authentik - namespace: authentik + namespace: {{ .Release.Namespace }} spec: interval: 30m chart: @@ -35,7 +35,7 @@ spec: sourceRef: kind: HelmRepository name: authentik - namespace: flux-system + namespace: {{ .Release.Namespace }} install: createNamespace: true upgrade: diff --git a/templates/dns-bind.yaml b/templates/dns-bind.yaml index 23eab06..08becfa 100644 --- a/templates/dns-bind.yaml +++ b/templates/dns-bind.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: bind-master-config - namespace: dns + namespace: {{ .Release.Namespace }} data: named.conf: | include "/etc/bind/externaldns-key.conf"; @@ -52,7 +52,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: bind-master - namespace: dns + namespace: {{ .Release.Namespace }} spec: selector: matchLabels: @@ -122,7 +122,7 @@ apiVersion: v1 kind: Service metadata: name: bind-master - namespace: dns + namespace: {{ .Release.Namespace }} spec: selector: app: bind-master diff --git a/templates/dns-externaldns.yaml b/templates/dns-externaldns.yaml index ed64c21..f713c50 100644 --- a/templates/dns-externaldns.yaml +++ b/templates/dns-externaldns.yaml @@ -26,19 +26,19 @@ roleRef: subjects: - kind: ServiceAccount name: external-dns - namespace: dns + namespace: {{ .Release.Namespace }} --- apiVersion: v1 kind: ServiceAccount metadata: name: external-dns - namespace: dns + namespace: {{ .Release.Namespace }} --- apiVersion: apps/v1 kind: Deployment metadata: name: external-dns - namespace: dns + namespace: {{ .Release.Namespace }} spec: replicas: 1 selector: diff --git a/templates/files-nextcloud.yaml b/templates/files-nextcloud.yaml index 2ef2de0..6c5bc88 100644 --- a/templates/files-nextcloud.yaml +++ b/templates/files-nextcloud.yaml @@ -22,7 +22,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: nextcloud-pvc - namespace: nextcloud + namespace: {{ .Release.Namespace }} spec: accessModes: - ReadWriteOnce @@ -36,7 +36,7 @@ apiVersion: v1 kind: Service metadata: name: nextcloud - namespace: nextcloud + namespace: {{ .Release.Namespace }} spec: ports: - port: 80 @@ -47,7 +47,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: nextcloud - namespace: nextcloud + namespace: {{ .Release.Namespace }} spec: securityContext: runAsUser: 1000 @@ -94,7 +94,7 @@ apiVersion: k8s.mariadb.com/v1alpha1 kind: MariaDB metadata: name: nextcloud-db - namespace: nextcloud + namespace: {{ .Release.Namespace }} spec: rootPasswordSecretKeyRef: name: nextcloud-secrets @@ -112,7 +112,7 @@ apiVersion: v1 kind: Secret metadata: name: wildcard-hxme-net - namespace: nextcloud + namespace: {{ .Release.Namespace }} annotations: replicator.v1.mittwald.de/replicate-from: cert-manager/wildcard-hxme-net --- @@ -120,7 +120,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: nextcloud - namespace: nextcloud + namespace: {{ .Release.Namespace }} annotations: external-dns.alpha.kubernetes.io/hostname: nc.hxme.net spec: diff --git a/templates/files-syncthing.yaml b/templates/files-syncthing.yaml index a7279b2..52830e4 100644 --- a/templates/files-syncthing.yaml +++ b/templates/files-syncthing.yaml @@ -8,7 +8,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: syncthing-data - namespace: syncthing + namespace: {{ .Release.Namespace }} spec: accessModes: - ReadWriteOnce @@ -33,7 +33,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: syncthing-share - namespace: syncthing + namespace: {{ .Release.Namespace }} spec: accessModes: - ReadWriteOnce @@ -46,7 +46,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: syncthing - namespace: syncthing + namespace: {{ .Release.Namespace }} spec: replicas: 1 selector: @@ -86,7 +86,7 @@ apiVersion: v1 kind: Service metadata: name: syncthing - namespace: syncthing + namespace: {{ .Release.Namespace }} spec: selector: app: syncthing diff --git a/templates/monitoring-grafana.yaml b/templates/monitoring-grafana.yaml index 47ed5e0..cd7576d 100644 --- a/templates/monitoring-grafana.yaml +++ b/templates/monitoring-grafana.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: grafana - namespace: monitoring + namespace: {{ .Release.Namespace }} spec: interval: 30m chart: @@ -13,7 +13,7 @@ spec: sourceRef: kind: HelmRepository name: grafana - namespace: flux-system + namespace: {{ .Release.Namespace }} install: createNamespace: true values: diff --git a/templates/monitoring-loki.yaml b/templates/monitoring-loki.yaml index b327a8e..97480af 100644 --- a/templates/monitoring-loki.yaml +++ b/templates/monitoring-loki.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: loki - namespace: monitoring + namespace: {{ .Release.Namespace }} spec: interval: 30m chart: @@ -13,7 +13,7 @@ spec: sourceRef: kind: HelmRepository name: grafana - namespace: flux-system + namespace: {{ .Release.Namespace }} install: createNamespace: true values: diff --git a/templates/monitoring-prometheus.yaml b/templates/monitoring-prometheus.yaml index dd4d5a6..fb59b87 100644 --- a/templates/monitoring-prometheus.yaml +++ b/templates/monitoring-prometheus.yaml @@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: prometheus-community - namespace: flux-system + namespace: {{ .Release.Namespace }} spec: url: https://prometheus-community.github.io/helm-charts interval: 1h @@ -12,7 +12,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: prometheus-operator - namespace: monitoring + namespace: {{ .Release.Namespace }} spec: interval: 30m chart: @@ -22,7 +22,7 @@ spec: sourceRef: kind: HelmRepository name: prometheus-community - namespace: flux-system + namespace: {{ .Release.Namespace }} install: createNamespace: true upgrade: diff --git a/templates/monitoring-provider.yaml b/templates/monitoring-provider.yaml index 3af442a..7fb6bf2 100644 --- a/templates/monitoring-provider.yaml +++ b/templates/monitoring-provider.yaml @@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: grafana - namespace: flux-system + namespace: {{ .Release.Namespace }} spec: url: https://grafana.github.io/helm-charts interval: 1h @@ -17,6 +17,6 @@ apiVersion: v1 kind: Secret metadata: name: wildcard-hxme-net - namespace: monitoring + namespace: {{ .Release.Namespace }} annotations: replicator.v1.mittwald.de/replicate-from: cert-manager/wildcard-hxme-net diff --git a/templates/operators-mariadb.yaml b/templates/operators-mariadb.yaml index 04febe6..702a210 100644 --- a/templates/operators-mariadb.yaml +++ b/templates/operators-mariadb.yaml @@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: mariadb-operator - namespace: flux-system + namespace: {{ .Release.Namespace }} spec: url: https://helm.mariadb.com/mariadb-operator interval: 1h @@ -17,7 +17,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: mariadb-operator-crds - namespace: mariadb-system + namespace: {{ .Release.Namespace }} spec: interval: 30m chart: @@ -27,7 +27,7 @@ spec: sourceRef: kind: HelmRepository name: mariadb-operator - namespace: flux-system + namespace: {{ .Release.Namespace }} install: createNamespace: true upgrade: @@ -38,7 +38,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: mariadb-operator - namespace: mariadb-system + namespace: {{ .Release.Namespace }} spec: interval: 30m chart: @@ -48,12 +48,12 @@ spec: sourceRef: kind: HelmRepository name: mariadb-operator - namespace: flux-system + namespace: {{ .Release.Namespace }} install: createNamespace: true dependsOn: - name: mariadb-operator-crds - namespace: mariadb-system + namespace: {{ .Release.Namespace }} values: metrics: enabled: true diff --git a/templates/operators-replicator.yaml b/templates/operators-replicator.yaml index e8ec276..52840a1 100644 --- a/templates/operators-replicator.yaml +++ b/templates/operators-replicator.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: kubernetes-replicator - namespace: kube-system + namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -63,13 +63,13 @@ roleRef: subjects: - kind: ServiceAccount name: kubernetes-replicator - namespace: kube-system + namespace: {{ .Release.Namespace }} --- apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository metadata: name: mittwald - namespace: flux-system + namespace: {{ .Release.Namespace }} spec: url: https://helm.mittwald.de interval: 1h @@ -78,7 +78,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: kubernetes-replicator - namespace: kube-system + namespace: {{ .Release.Namespace }} spec: interval: 5m chart: @@ -87,7 +87,7 @@ spec: sourceRef: kind: HelmRepository name: mittwald - namespace: flux-system + namespace: {{ .Release.Namespace }} install: createNamespace: false upgrade: diff --git a/templates/remote-access-rustdesk.yaml b/templates/remote-access-rustdesk.yaml index 47ec81d..5ac5a21 100644 --- a/templates/remote-access-rustdesk.yaml +++ b/templates/remote-access-rustdesk.yaml @@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: rustdesk-charts - namespace: flux-system + namespace: {{ .Release.Namespace }} spec: url: https://charts.rustdesk.com interval: 1h @@ -17,7 +17,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: rustdesk-server - namespace: rustdesk + namespace: {{ .Release.Namespace }} spec: interval: 30m chart: @@ -27,7 +27,7 @@ spec: sourceRef: kind: HelmRepository name: rustdesk-charts - namespace: flux-system + namespace: {{ .Release.Namespace }} install: createNamespace: true values: diff --git a/templates/ssl-certmanager.yaml b/templates/ssl-certmanager.yaml index f238e14..1bef710 100644 --- a/templates/ssl-certmanager.yaml +++ b/templates/ssl-certmanager.yaml @@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: jetstack - namespace: flux-system + namespace: {{ .Release.Namespace }} spec: url: https://charts.jetstack.io interval: 1h @@ -12,7 +12,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: cert-manager - namespace: cert-manager + namespace: {{ .Release.Namespace }} spec: interval: 30m chart: @@ -22,7 +22,7 @@ spec: sourceRef: kind: HelmRepository name: jetstack - namespace: flux-system + namespace: {{ .Release.Namespace }} install: crds: CreateReplace createNamespace: true @@ -56,7 +56,7 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: wildcard-hxme-net - namespace: cert-manager + namespace: {{ .Release.Namespace }} spec: secretName: wildcard-hxme-net secretTemplate: diff --git a/templates/synctools-vaultwarden.yaml b/templates/synctools-vaultwarden.yaml index 93c3475..e0ced35 100644 --- a/templates/synctools-vaultwarden.yaml +++ b/templates/synctools-vaultwarden.yaml @@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: bjw-s-charts - namespace: flux-system + namespace: {{ .Release.Namespace }} spec: url: https://bjw-s.github.io/helm-charts/ interval: 1h @@ -17,7 +17,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: vaultwarden - namespace: bitwarden + namespace: {{ .Release.Namespace }} spec: interval: 30m chart: @@ -27,7 +27,7 @@ spec: sourceRef: kind: HelmRepository name: bjw-s-charts - namespace: flux-system + namespace: {{ .Release.Namespace }} install: createNamespace: true values: