templates/ai-openweb.yaml

@@ -1,9 +1,14 @@
 ---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ai
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: openwebui
-  namespace: {{ .Release.Namespace }}
+  namespace: ai
 spec:
   replicas: 1
   selector:
@@ -35,7 +40,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: openwebui
-  namespace: {{ .Release.Namespace }}
+  namespace: ai
 spec:
   selector:
     app: openwebui
@@ -48,7 +53,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: openwebui
-  namespace: {{ .Release.Namespace }}
+  namespace: ai
   annotations:
     kubernetes.io/ingress.class: "traefik" 
     external-dns.alpha.kubernetes.io/hostname: nc.hxme.net

templates/auth-authentik.yaml

@@ -1,9 +1,14 @@
 ---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: authentik
+---
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: authentik
-  namespace: {{ .Release.Namespace }}
+  namespace: flux-system
 spec:
   url: https://charts.goauthentik.io/
   interval: 1h
@@ -12,7 +17,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: wildcard-hxme-net
-  namespace: {{ .Release.Namespace }}
+  namespace: authentik
   annotations:
     replicator.v1.mittwald.de/replicate-from: cert-manager/wildcard-hxme-net
 ---
@@ -20,7 +25,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: authentik
-  namespace: {{ .Release.Namespace }}
+  namespace: authentik
 spec:
   interval: 30m
   chart:
@@ -30,7 +35,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: authentik
-        namespace: {{ .Release.Namespace }}
+        namespace: flux-system
   install:
     createNamespace: true
   upgrade:

templates/dns-bind.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: bind-master-config
-  namespace: {{ .Release.Namespace }}
+  namespace: dns
 data:
   named.conf: |
     include "/etc/bind/externaldns-key.conf";
@@ -52,7 +52,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: bind-master
-  namespace: {{ .Release.Namespace }}
+  namespace: dns
 spec:
   selector:
     matchLabels:
@@ -122,7 +122,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: bind-master
-  namespace: {{ .Release.Namespace }}
+  namespace: dns
 spec:
   selector:
     app: bind-master

templates/dns-externaldns.yaml

@@ -26,19 +26,19 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: external-dns
-    namespace: {{ .Release.Namespace }}
+    namespace: dns
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: external-dns
-  namespace: {{ .Release.Namespace }}
+  namespace: dns
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: external-dns
-  namespace: {{ .Release.Namespace }}
+  namespace: dns
 spec:
   replicas: 1
   selector:

templates/dns-namespace.yaml

@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: dns

templates/files-nextcloud.yaml

@@ -1,5 +1,10 @@
 ---
 apiVersion: v1
+kind: Namespace
+metadata:
+  name: nextcloud
+---
+apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: nextcloud-pv
@@ -17,7 +22,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: nextcloud-pvc
-  namespace: {{ .Release.Namespace }}
+  namespace: nextcloud
 spec:
   accessModes:
     - ReadWriteOnce
@@ -31,7 +36,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: nextcloud
-  namespace: {{ .Release.Namespace }}
+  namespace: nextcloud
 spec:
   ports:
     - port: 80
@@ -42,7 +47,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nextcloud
-  namespace: {{ .Release.Namespace }}
+  namespace: nextcloud
 spec:
   securityContext:
     runAsUser:  1000
@@ -89,7 +94,7 @@ apiVersion: k8s.mariadb.com/v1alpha1
 kind: MariaDB
 metadata:
   name: nextcloud-db
-  namespace: {{ .Release.Namespace }}
+  namespace: nextcloud
 spec:
   rootPasswordSecretKeyRef:
     name: nextcloud-secrets
@@ -107,7 +112,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: wildcard-hxme-net
-  namespace: {{ .Release.Namespace }}
+  namespace: nextcloud
   annotations:
     replicator.v1.mittwald.de/replicate-from: cert-manager/wildcard-hxme-net
 ---
@@ -115,7 +120,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: nextcloud
-  namespace: {{ .Release.Namespace }}
+  namespace: nextcloud
   annotations:
     external-dns.alpha.kubernetes.io/hostname: nc.hxme.net
 spec:

templates/files-syncthing.yaml

@@ -1,9 +1,14 @@
 ---
 apiVersion: v1
+kind: Namespace
+metadata:
+  name: syncthing
+---
+apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: syncthing-data
-  namespace: {{ .Release.Namespace }}
+  namespace: syncthing
 spec:
   accessModes:
     - ReadWriteOnce
@@ -28,7 +33,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: syncthing-share
-  namespace: {{ .Release.Namespace }}
+  namespace: syncthing
 spec:
   accessModes:
     - ReadWriteOnce
@@ -41,7 +46,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: syncthing
-  namespace: {{ .Release.Namespace }}
+  namespace: syncthing
 spec:
   replicas: 1
   selector:
@@ -81,7 +86,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: syncthing
-  namespace: {{ .Release.Namespace }}
+  namespace: syncthing
 spec:
   selector:
     app: syncthing

templates/monitoring-grafana.yaml

@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: grafana
-  namespace: {{ .Release.Namespace }}
+  namespace: monitoring
 spec:
   interval: 30m
   chart:
@@ -13,7 +13,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: grafana
-        namespace: {{ .Release.Namespace }}
+        namespace: flux-system
   install:
     createNamespace: true
   values:

templates/monitoring-loki.yaml

@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: loki
-  namespace: {{ .Release.Namespace }}
+  namespace: monitoring
 spec:
   interval: 30m
   chart:
@@ -13,7 +13,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: grafana
-        namespace: {{ .Release.Namespace }}
+        namespace: flux-system
   install:
     createNamespace: true
   values:

templates/monitoring-prometheus.yaml

@@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: prometheus-community
-  namespace: {{ .Release.Namespace }}
+  namespace: flux-system
 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: {{ .Release.Namespace }}
+  namespace: monitoring
 spec:
   interval: 30m
   chart:
@@ -22,9 +22,9 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: prometheus-community
-        namespace: {{ .Release.Namespace }}
+        namespace: flux-system
   install:
-    createNamespace: false
+    createNamespace: true
   upgrade:
     disableWait: true
   timeout: 5m

templates/monitoring-provider.yaml

@@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: grafana
-  namespace: {{ .Release.Namespace }}
+  namespace: flux-system
 spec:
   url: https://grafana.github.io/helm-charts
   interval: 1h
@@ -17,6 +17,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: wildcard-hxme-net
-  namespace: {{ .Release.Namespace }}
+  namespace: monitoring
   annotations:
     replicator.v1.mittwald.de/replicate-from: cert-manager/wildcard-hxme-net

templates/operators-mariadb.yaml

@@ -1,9 +1,14 @@
 ---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mariadb-system
+---
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: mariadb-operator
-  namespace: {{ .Release.Namespace }}
+  namespace: flux-system
 spec:
   url: https://helm.mariadb.com/mariadb-operator
   interval: 1h
@@ -12,7 +17,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: mariadb-operator-crds
-  namespace: {{ .Release.Namespace }}
+  namespace: mariadb-system
 spec:
   interval: 30m
   chart:
@@ -22,7 +27,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: mariadb-operator
-        namespace: {{ .Release.Namespace }}
+        namespace: flux-system
   install:
     createNamespace: true
   upgrade:
@@ -33,7 +38,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: mariadb-operator
-  namespace: {{ .Release.Namespace }}
+  namespace: mariadb-system
 spec:
   interval: 30m
   chart:
@@ -43,12 +48,12 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: mariadb-operator
-        namespace: {{ .Release.Namespace }}
+        namespace: flux-system
   install:
     createNamespace: true
   dependsOn:
     - name: mariadb-operator-crds
-      namespace: {{ .Release.Namespace }}
+      namespace: mariadb-system
   values:
     metrics:
       enabled: true

templates/operators-replicator.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: kubernetes-replicator
-  namespace: {{ .Release.Namespace }}
+  namespace: kube-system
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -63,13 +63,13 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: kubernetes-replicator
-    namespace: {{ .Release.Namespace }}
+    namespace: kube-system
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
   name: mittwald
-  namespace: {{ .Release.Namespace }}
+  namespace: flux-system
 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: {{ .Release.Namespace }}
+  namespace: kube-system
 spec:
   interval: 5m
   chart:
@@ -87,7 +87,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: mittwald
-        namespace: {{ .Release.Namespace }}
+        namespace: flux-system
   install:
     createNamespace: false
   upgrade:

templates/remote-access-rustdesk.yaml

@@ -1,9 +1,14 @@
 ---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: rustdesk
+---
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: rustdesk-charts
-  namespace: {{ .Release.Namespace }}
+  namespace: flux-system
 spec:
   url: https://charts.rustdesk.com
   interval: 1h
@@ -12,7 +17,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: rustdesk-server
-  namespace: {{ .Release.Namespace }}
+  namespace: rustdesk
 spec:
   interval: 30m
   chart:
@@ -22,7 +27,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: rustdesk-charts
-        namespace: {{ .Release.Namespace }}
+        namespace: flux-system
   install:
     createNamespace: true
   values:

templates/ssl-certmanager.yaml

@@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: jetstack
-  namespace: {{ .Release.Namespace }}
+  namespace: flux-system
 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: {{ .Release.Namespace }}
+  namespace: cert-manager
 spec:
   interval: 30m
   chart:
@@ -22,10 +22,10 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: jetstack
-        namespace: {{ .Release.Namespace }}
+        namespace: flux-system
   install:
     crds: CreateReplace
-    createNamespace: false
+    createNamespace: true
   values:
     installCRDs: true
     extraArgs:
@@ -56,7 +56,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: wildcard-hxme-net
-  namespace: {{ .Release.Namespace }}
+  namespace: cert-manager
 spec:
   secretName: wildcard-hxme-net
   secretTemplate:

templates/synctools-vaultwarden.yaml

@@ -1,9 +1,14 @@
 ---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: bitwarden
+---
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: bjw-s-charts
-  namespace: {{ .Release.Namespace }}
+  namespace: flux-system
 spec:
   url: https://bjw-s.github.io/helm-charts/
   interval: 1h
@@ -12,7 +17,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: vaultwarden
-  namespace: {{ .Release.Namespace }}
+  namespace: bitwarden
 spec:
   interval: 30m
   chart:
@@ -22,7 +27,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
-        namespace: {{ .Release.Namespace }}
+        namespace: flux-system
   install:
     createNamespace: true
   values: