feat(kube-nas): standardisation kustomizations and flux-sync

tyriis · Feb 1, 2025 · af931f5 · af931f5
1 parent 2080a5a
commit af931f5
Show file tree

Hide file tree

Showing 42 changed files with 202 additions and 128 deletions.
diff --git a/kubernetes/kube-nas/apps/auth-system/kustomization.yaml b/kubernetes/kube-nas/apps/auth-system/kustomization.yaml
@@ -3,5 +3,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./namespace.yaml
+  - namespace.yaml
   - ./oauth2-proxy/flux-sync.yaml
diff --git a/kubernetes/kube-nas/apps/auth-system/oauth2-proxy/app/kustomization.yaml b/kubernetes/kube-nas/apps/auth-system/oauth2-proxy/app/kustomization.yaml
@@ -2,7 +2,6 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: auth-system
 resources:
   - secrets.sops.yaml
   - helm-release.yaml
diff --git a/kubernetes/kube-nas/apps/auth-system/oauth2-proxy/flux-sync.yaml b/kubernetes/kube-nas/apps/auth-system/oauth2-proxy/flux-sync.yaml
@@ -3,19 +3,21 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: oauth2-proxy
+  name: &appname oauth2-proxy
   namespace: flux-system
 spec:
-  dependsOn:
-    - name: dragonfly-cluster
-  interval: 10m
+  targetNamespace: auth-system
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *appname
   path: ./kubernetes/kube-nas/apps/auth-system/oauth2-proxy/app
   prune: true
   sourceRef:
     kind: GitRepository
     name: home-ops
-  targetNamespace: auth-system
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: oauth2-proxy
   wait: true
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
+  dependsOn:
+    - name: dragonfly-cluster
diff --git a/kubernetes/kube-nas/apps/backup-system/volsync/app/kustomization.yaml b/kubernetes/kube-nas/apps/backup-system/volsync/app/kustomization.yaml
@@ -3,4 +3,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./helm-release.yaml
+  - helm-release.yaml
diff --git a/kubernetes/kube-nas/apps/backup-system/volsync/flux-sync.yaml b/kubernetes/kube-nas/apps/backup-system/volsync/flux-sync.yaml
@@ -8,17 +8,18 @@ metadata:
   labels:
     substitution.flux.home.arpa/enabled: "true"
 spec:
+  targetNamespace: backup-system
   commonMetadata:
     labels:
       app.kubernetes.io/name: *appname
-  targetNamespace: backup-system
-  dependsOn:
-    - name: snapshot-controller
-  interval: 10m
   path: ./kubernetes/kube-nas/apps/backup-system/volsync/app
   prune: true
-  wait: true
   sourceRef:
     kind: GitRepository
     name: home-ops
-  timeout: 3m
+  wait: true
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
+  dependsOn:
+    - name: snapshot-controller
diff --git a/kubernetes/kube-nas/apps/bunkerweb-ingress/bunkerweb/flux-sync.yaml b/kubernetes/kube-nas/apps/bunkerweb-ingress/bunkerweb/flux-sync.yaml
@@ -12,14 +12,14 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *appname
-  interval: 10m
-  dependsOn:
-    - name: cert-manager-issuers
   path: ./kubernetes/kube-nas/apps/bunkerweb-ingress/bunkerweb/app
   prune: true
   sourceRef:
     kind: GitRepository
     name: home-ops
   wait: true
+  interval: 30m
   retryInterval: 1m
   timeout: 5m
+  dependsOn:
+    - name: cert-manager-issuers
diff --git a/kubernetes/kube-nas/apps/bunkerweb-ingress/kustomization.yaml b/kubernetes/kube-nas/apps/bunkerweb-ingress/kustomization.yaml
@@ -3,5 +3,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./namespace.yaml
+  - namespace.yaml
   - ./bunkerweb/flux-sync.yaml
diff --git a/kubernetes/kube-nas/apps/cert-manager/cert-manager/app/kustomization.yaml b/kubernetes/kube-nas/apps/cert-manager/cert-manager/app/kustomization.yaml
@@ -2,6 +2,5 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: cert-manager
 resources:
   - helm-release.yaml
diff --git a/kubernetes/kube-nas/apps/cert-manager/cert-manager/flux-sync.yaml b/kubernetes/kube-nas/apps/cert-manager/cert-manager/flux-sync.yaml
@@ -3,30 +3,43 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cert-manager
+  name: &appname cert-manager
   namespace: flux-system
 spec:
-  interval: 10m
+  targetNamespace: cert-manager
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *appname
   path: ./kubernetes/kube-nas/apps/cert-manager/cert-manager/app
   prune: true
   sourceRef:
     kind: GitRepository
     name: home-ops
   wait: true
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
+
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cert-manager-issuers
+  name: &appname cert-manager-issuers
   namespace: flux-system
 spec:
-  interval: 10m
+  targetNamespace: cert-manager
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *appname
   path: ./kubernetes/kube-nas/apps/cert-manager/cert-manager/issuers
   prune: true
   sourceRef:
     kind: GitRepository
     name: home-ops
   wait: true
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
   dependsOn:
     - name: cert-manager
diff --git a/kubernetes/kube-nas/apps/cert-manager/cert-manager/issuers/kustomization.yaml b/kubernetes/kube-nas/apps/cert-manager/cert-manager/issuers/kustomization.yaml
@@ -2,7 +2,6 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: cert-manager
 resources:
   - cluster-issuer-self-signed.yaml
   - secret.sops.yaml

diff --git a/kubernetes/kube-nas/apps/cert-manager/kustomization.yaml b/kubernetes/kube-nas/apps/cert-manager/kustomization.yaml
@@ -3,5 +3,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./namespace.yaml
+  - namespace.yaml
   - ./cert-manager/flux-sync.yaml
diff --git a/kubernetes/kube-nas/apps/database-system/cloudnative-pg/flux-sync.yaml b/kubernetes/kube-nas/apps/database-system/cloudnative-pg/flux-sync.yaml
@@ -6,19 +6,19 @@ metadata:
   name: &appname cloudnative-pg
   namespace: flux-system
 spec:
+  targetNamespace: database-system
   commonMetadata:
     labels:
       app.kubernetes.io/name: *appname
-  interval: 30m
   path: ./kubernetes/kube-nas/apps/database-system/cloudnative-pg/operator
   prune: true
-  retryInterval: 1m
   sourceRef:
     kind: GitRepository
     name: home-ops
-  targetNamespace: database-system
-  timeout: 3m
   wait: true
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
 
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
@@ -28,21 +28,21 @@ metadata:
   name: &appname cloudnative-pg-cluster
   namespace: flux-system
 spec:
+  targetNamespace: database-system
   commonMetadata:
     labels:
       app.kubernetes.io/name: *appname
-  dependsOn:
-    - name: cloudnative-pg
-    - name: dbman
-    - name: minio
-    - name: openebs
-  interval: 30m
   path: ./kubernetes/kube-nas/apps/database-system/cloudnative-pg/cluster
   prune: true
-  retryInterval: 15s
   sourceRef:
     kind: GitRepository
     name: home-ops
-  targetNamespace: database-system
-  timeout: 3m
   wait: true
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
+  dependsOn:
+    - name: cloudnative-pg
+    - name: dbman
+    - name: minio
+    - name: openebs
diff --git a/kubernetes/kube-nas/apps/database-system/dbman/flux-sync.yaml b/kubernetes/kube-nas/apps/database-system/dbman/flux-sync.yaml
@@ -6,16 +6,16 @@ metadata:
   name: &appname dbman
   namespace: flux-system
 spec:
+  targetNamespace: database-system
   commonMetadata:
     labels:
       app.kubernetes.io/name: *appname
-  interval: 30m
   path: ./kubernetes/kube-nas/apps/database-system/dbman/operator
   prune: true
   sourceRef:
     kind: GitRepository
     name: home-ops
-  targetNamespace: database-system
-  timeout: 3m
-  retryInterval: 1m
   wait: true
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
diff --git a/kubernetes/kube-nas/apps/database-system/dragonfly/flux-sync.yaml b/kubernetes/kube-nas/apps/database-system/dragonfly/flux-sync.yaml
@@ -21,6 +21,7 @@ spec:
   interval: 30m
   retryInterval: 1m
   timeout: 5m
+
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
@@ -35,8 +36,6 @@ spec:
       app.kubernetes.io/name: *appname
       app.kubernetes.io/instance: *appname
       app.kubernetes.io/component: dragonfly
-  dependsOn:
-    - name: dragonfly-operator
   path: ./kubernetes/kube-nas/apps/database-system/dragonfly/cluster
   prune: true
   sourceRef:
@@ -46,3 +45,5 @@ spec:
   interval: 30m
   retryInterval: 1m
   timeout: 5m
+  dependsOn:
+    - name: dragonfly-operator
diff --git a/kubernetes/kube-nas/apps/database-system/kustomization.yaml b/kubernetes/kube-nas/apps/database-system/kustomization.yaml
@@ -3,7 +3,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./namespace.yaml
+  - namespace.yaml
   - ./cloudnative-pg/flux-sync.yaml
   - ./dbman/flux-sync.yaml
   - ./dragonfly/flux-sync.yaml
diff --git a/kubernetes/kube-nas/apps/default/echo-server/app/kustomization.yaml b/kubernetes/kube-nas/apps/default/echo-server/app/kustomization.yaml
@@ -2,9 +2,5 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: default
 resources:
-  - ./helm-release.yaml
-commonLabels:
-  app.kubernetes.io/name: echo-server
-  app.kubernetes.io/instance: echo-server
+  - helm-release.yaml
diff --git a/kubernetes/kube-nas/apps/default/echo-server/flux-sync.yaml b/kubernetes/kube-nas/apps/default/echo-server/flux-sync.yaml
@@ -3,15 +3,21 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: echo-server
+  name: &appname echo-server
   namespace: flux-system
   labels:
     substitution.flux.home.arpa/enabled: "true"
 spec:
-  interval: 10m
+  targetNamespace: default
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *appname
   path: ./kubernetes/kube-nas/apps/default/echo-server/app
   prune: true
   sourceRef:
     kind: GitRepository
     name: home-ops
   wait: true
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
diff --git a/kubernetes/kube-nas/apps/default/kustomization.yaml b/kubernetes/kube-nas/apps/default/kustomization.yaml
@@ -3,5 +3,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./namespace.yaml
+  - namespace.yaml
   - ./echo-server/flux-sync.yaml
diff --git a/kubernetes/kube-nas/apps/kube-system/cilium/app/kustomization.yaml b/kubernetes/kube-nas/apps/kube-system/cilium/app/kustomization.yaml
@@ -2,9 +2,8 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: kube-system
 resources:
-  - ./helm-release.yaml
+  - helm-release.yaml
   # as we need to bootstrap cilium it is fine to use crd before install
-  - ./cilium-l2-announcement-policy.yaml
-  - ./cilium-load-balancer-ip-pool.yaml
+  - cilium-l2-announcement-policy.yaml
+  - cilium-load-balancer-ip-pool.yaml
diff --git a/kubernetes/kube-nas/apps/kube-system/cilium/flux-sync.yaml b/kubernetes/kube-nas/apps/kube-system/cilium/flux-sync.yaml
@@ -3,11 +3,15 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cilium
+  name: &appname cilium
   namespace: flux-system
 spec:
+  targetNamespace: kube-system
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *appname
   path: ./kubernetes/kube-nas/apps/kube-system/cilium/app
-  prune: false # never should be deleted
+  prune: false # should never be deleted
   sourceRef:
     kind: GitRepository
     name: home-ops

diff --git a/kubernetes/kube-nas/apps/kube-system/coredns/app/kustomization.yaml b/kubernetes/kube-nas/apps/kube-system/coredns/app/kustomization.yaml
@@ -2,6 +2,5 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: kube-system
 resources:
-  - ./helm-release.yaml
+  - helm-release.yaml
diff --git a/kubernetes/kube-nas/apps/kube-system/coredns/flux-sync.yaml b/kubernetes/kube-nas/apps/kube-system/coredns/flux-sync.yaml
@@ -3,13 +3,17 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: coredns
+  name: &appname coredns
   namespace: flux-system
   labels:
     substitution.flux.home.arpa/enabled: "true"
 spec:
+  targetNamespace: kube-system
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *appname
   path: ./kubernetes/kube-nas/apps/kube-system/coredns/app
-  prune: false # never should be deleted
+  prune: false # should never be deleted
   sourceRef:
     kind: GitRepository
     name: home-ops

diff --git a/kubernetes/kube-nas/apps/kube-system/kubelet-csr-approver/app/kustomization.yaml b/kubernetes/kube-nas/apps/kube-system/kubelet-csr-approver/app/kustomization.yaml
@@ -2,6 +2,5 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: kube-system
 resources:
-  - ./helm-release.yaml
+  - helm-release.yaml