From 370b3a8f2626dafa04ee3ef2247b79c9b20fd893 Mon Sep 17 00:00:00 2001 From: Ronald Date: Sat, 1 Feb 2025 14:45:56 +0100 Subject: [PATCH] Move namespace to components (#249) Co-authored-by: Ronald Philipsen --- .../apps/actions-runner-system/kustomization.yaml | 12 +++++++++--- kubernetes/apps/actions-runner-system/namespace.yaml | 9 --------- kubernetes/apps/cert-manager/kustomization.yaml | 10 +++++++++- kubernetes/apps/cert-manager/namespace.yaml | 8 -------- kubernetes/apps/database/kustomization.yaml | 10 +++++++++- kubernetes/apps/database/namespace.yaml | 6 ------ kubernetes/apps/default/kustomization.yaml | 10 +++++++++- kubernetes/apps/default/namespace.yaml | 6 ------ kubernetes/apps/external-secrets/kustomization.yaml | 12 +++++++++--- kubernetes/apps/external-secrets/namespace.yaml | 8 -------- kubernetes/apps/flux-system/kustomization.yaml | 10 +++++++++- kubernetes/apps/flux-system/namespace.yaml | 8 -------- kubernetes/apps/home-automation/kustomization.yaml | 11 +++++++++-- kubernetes/apps/home-automation/namespace.yaml | 8 -------- kubernetes/apps/kube-system/kustomization.yaml | 10 +++++++++- kubernetes/apps/kube-system/namespace.yaml | 8 -------- kubernetes/apps/network/kustomization.yaml | 10 +++++++++- kubernetes/apps/network/namespace.yaml | 8 -------- kubernetes/apps/observability/kustomization.yaml | 10 +++++++++- kubernetes/apps/observability/namespace.yaml | 8 -------- kubernetes/apps/openebs-system/kustomization.yaml | 10 +++++++++- kubernetes/apps/openebs-system/namespace.yaml | 8 -------- kubernetes/components/namespace/kustomization.yaml | 6 ++++++ kubernetes/components/namespace/namespace.yaml | 6 ++++++ 24 files changed, 111 insertions(+), 101 deletions(-) delete mode 100644 kubernetes/apps/actions-runner-system/namespace.yaml delete mode 100644 kubernetes/apps/cert-manager/namespace.yaml delete mode 100644 kubernetes/apps/database/namespace.yaml delete mode 100644 kubernetes/apps/default/namespace.yaml delete mode 100644 kubernetes/apps/external-secrets/namespace.yaml delete mode 100644 kubernetes/apps/flux-system/namespace.yaml delete mode 100644 kubernetes/apps/home-automation/namespace.yaml delete mode 100644 kubernetes/apps/kube-system/namespace.yaml delete mode 100644 kubernetes/apps/network/namespace.yaml delete mode 100644 kubernetes/apps/observability/namespace.yaml delete mode 100644 kubernetes/apps/openebs-system/namespace.yaml create mode 100644 kubernetes/components/namespace/kustomization.yaml create mode 100644 kubernetes/components/namespace/namespace.yaml diff --git a/kubernetes/apps/actions-runner-system/kustomization.yaml b/kubernetes/apps/actions-runner-system/kustomization.yaml index 98183e38..6f3ad4e6 100644 --- a/kubernetes/apps/actions-runner-system/kustomization.yaml +++ b/kubernetes/apps/actions-runner-system/kustomization.yaml @@ -3,8 +3,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # Pre Flux-Kustomizations - - ./namespace.yaml - # Flux-Kustomizations - ./gha-runner-scale-set-controller/ks.yaml - ./gha-runner-scale-set/ks.yaml +components: + - ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: actions-runner-system + target: + kind: Namespace diff --git a/kubernetes/apps/actions-runner-system/namespace.yaml b/kubernetes/apps/actions-runner-system/namespace.yaml deleted file mode 100644 index ae4d075f..00000000 --- a/kubernetes/apps/actions-runner-system/namespace.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: actions-runner-system - annotations: - kustomize.toolkit.fluxcd.io/prune: disabled - volsync.backube/privileged-movers: "true" diff --git a/kubernetes/apps/cert-manager/kustomization.yaml b/kubernetes/apps/cert-manager/kustomization.yaml index abbe7755..b32e7b40 100644 --- a/kubernetes/apps/cert-manager/kustomization.yaml +++ b/kubernetes/apps/cert-manager/kustomization.yaml @@ -3,5 +3,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./namespace.yaml - ./cert-manager/ks.yaml +components: +- ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: cert-manager + target: + kind: Namespace diff --git a/kubernetes/apps/cert-manager/namespace.yaml b/kubernetes/apps/cert-manager/namespace.yaml deleted file mode 100644 index 4c97ba2a..00000000 --- a/kubernetes/apps/cert-manager/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: cert-manager - labels: - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/kubernetes/apps/database/kustomization.yaml b/kubernetes/apps/database/kustomization.yaml index bc888ee4..35bad2f0 100644 --- a/kubernetes/apps/database/kustomization.yaml +++ b/kubernetes/apps/database/kustomization.yaml @@ -3,7 +3,15 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./namespace.yaml - ./cloudnative-pg/ks.yaml - ./emqx/ks.yaml - ./minio/ks.yaml +components: + - ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: database + target: + kind: Namespace diff --git a/kubernetes/apps/database/namespace.yaml b/kubernetes/apps/database/namespace.yaml deleted file mode 100644 index 1b9822f0..00000000 --- a/kubernetes/apps/database/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: database diff --git a/kubernetes/apps/default/kustomization.yaml b/kubernetes/apps/default/kustomization.yaml index b3e5d244..d78d5800 100644 --- a/kubernetes/apps/default/kustomization.yaml +++ b/kubernetes/apps/default/kustomization.yaml @@ -3,7 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./namespace.yaml - ./nginx-static/ks.yaml - ./jellyfin/ks.yaml - ./sabnzbd/ks.yaml @@ -13,3 +12,12 @@ resources: - ./recyclarr/ks.yaml - ./prowlarr/ks.yaml - ./qbittorrent/ks.yaml +components: + - ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: default + target: + kind: Namespace diff --git a/kubernetes/apps/default/namespace.yaml b/kubernetes/apps/default/namespace.yaml deleted file mode 100644 index 1bf69b44..00000000 --- a/kubernetes/apps/default/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: default diff --git a/kubernetes/apps/external-secrets/kustomization.yaml b/kubernetes/apps/external-secrets/kustomization.yaml index 2af980e3..6ab604f1 100644 --- a/kubernetes/apps/external-secrets/kustomization.yaml +++ b/kubernetes/apps/external-secrets/kustomization.yaml @@ -3,8 +3,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # Pre Flux-Kustomizations - - ./namespace.yaml - # Flux-Kustomizations - ./external-secrets/ks.yaml - ./onepassword-connect/ks.yaml +components: + - ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: external-secrets + target: + kind: Namespace diff --git a/kubernetes/apps/external-secrets/namespace.yaml b/kubernetes/apps/external-secrets/namespace.yaml deleted file mode 100644 index cf67dad5..00000000 --- a/kubernetes/apps/external-secrets/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: external-secrets - labels: - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/kubernetes/apps/flux-system/kustomization.yaml b/kubernetes/apps/flux-system/kustomization.yaml index fcfb6a18..555b4aaa 100644 --- a/kubernetes/apps/flux-system/kustomization.yaml +++ b/kubernetes/apps/flux-system/kustomization.yaml @@ -3,5 +3,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./namespace.yaml - ./flux-operator/ks.yaml +components: + - ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: flux-system + target: + kind: Namespace diff --git a/kubernetes/apps/flux-system/namespace.yaml b/kubernetes/apps/flux-system/namespace.yaml deleted file mode 100644 index 2f99e332..00000000 --- a/kubernetes/apps/flux-system/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: flux-system - labels: - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/kubernetes/apps/home-automation/kustomization.yaml b/kubernetes/apps/home-automation/kustomization.yaml index 8f382ea0..c6bc0a70 100644 --- a/kubernetes/apps/home-automation/kustomization.yaml +++ b/kubernetes/apps/home-automation/kustomization.yaml @@ -3,8 +3,15 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./namespace.yaml - ./esphome/ks.yaml - ./home-assistant/ks.yaml # - ./matter-server/ks.yaml - +components: + - ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: home-automation + target: + kind: Namespace diff --git a/kubernetes/apps/home-automation/namespace.yaml b/kubernetes/apps/home-automation/namespace.yaml deleted file mode 100644 index cd7dea70..00000000 --- a/kubernetes/apps/home-automation/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: home-automation - annotations: - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/kubernetes/apps/kube-system/kustomization.yaml b/kubernetes/apps/kube-system/kustomization.yaml index fadec332..5e01e59b 100644 --- a/kubernetes/apps/kube-system/kustomization.yaml +++ b/kubernetes/apps/kube-system/kustomization.yaml @@ -3,7 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./namespace.yaml - ./cilium/ks.yaml - ./coredns/ks.yaml - ./intel-device-plugin/ks.yaml @@ -12,3 +11,12 @@ resources: - ./node-feature-discovery/ks.yaml - ./reloader/ks.yaml - ./spegel/ks.yaml +components: +- ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: kube-system + target: + kind: Namespace diff --git a/kubernetes/apps/kube-system/namespace.yaml b/kubernetes/apps/kube-system/namespace.yaml deleted file mode 100644 index efe70796..00000000 --- a/kubernetes/apps/kube-system/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: kube-system - labels: - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/kubernetes/apps/network/kustomization.yaml b/kubernetes/apps/network/kustomization.yaml index d2303426..81b12f07 100644 --- a/kubernetes/apps/network/kustomization.yaml +++ b/kubernetes/apps/network/kustomization.yaml @@ -3,10 +3,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./namespace.yaml - ./blocky/ks.yaml - ./cloudflared/ks.yaml - ./echo-server/ks.yaml - ./external-dns/ks.yaml - ./ingress-nginx/ks.yaml - ./k8s-gateway/ks.yaml +components: + - ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: network + target: + kind: Namespace diff --git a/kubernetes/apps/network/namespace.yaml b/kubernetes/apps/network/namespace.yaml deleted file mode 100644 index da22bc6b..00000000 --- a/kubernetes/apps/network/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: network - labels: - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/kubernetes/apps/observability/kustomization.yaml b/kubernetes/apps/observability/kustomization.yaml index 9bc64f53..14a6d349 100644 --- a/kubernetes/apps/observability/kustomization.yaml +++ b/kubernetes/apps/observability/kustomization.yaml @@ -3,6 +3,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./namespace.yaml - ./grafana/ks.yaml - ./prometheus-operator-crds/ks.yaml +components: + - ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: observability + target: + kind: Namespace diff --git a/kubernetes/apps/observability/namespace.yaml b/kubernetes/apps/observability/namespace.yaml deleted file mode 100644 index 6e8f157d..00000000 --- a/kubernetes/apps/observability/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: observability - labels: - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/kubernetes/apps/openebs-system/kustomization.yaml b/kubernetes/apps/openebs-system/kustomization.yaml index 2de7d673..bacdd170 100644 --- a/kubernetes/apps/openebs-system/kustomization.yaml +++ b/kubernetes/apps/openebs-system/kustomization.yaml @@ -3,5 +3,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./namespace.yaml - ./openebs/ks.yaml +components: + - ../../components/namespace +patches: + - patch: | + - op: add + path: /metadata/name + value: openebs-system + target: + kind: Namespace diff --git a/kubernetes/apps/openebs-system/namespace.yaml b/kubernetes/apps/openebs-system/namespace.yaml deleted file mode 100644 index e6b60553..00000000 --- a/kubernetes/apps/openebs-system/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetesjsonschema.dev/v1.18.1-standalone-strict/namespace-v1.json -apiVersion: v1 -kind: Namespace -metadata: - name: openebs-system - labels: - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/kubernetes/components/namespace/kustomization.yaml b/kubernetes/components/namespace/kustomization.yaml new file mode 100644 index 00000000..cb864eba --- /dev/null +++ b/kubernetes/components/namespace/kustomization.yaml @@ -0,0 +1,6 @@ +--- +# yaml-language-server: $schema=https://json.schemastore.org/component.json +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +resources: + - ./namespace.yaml diff --git a/kubernetes/components/namespace/namespace.yaml b/kubernetes/components/namespace/namespace.yaml new file mode 100644 index 00000000..86098241 --- /dev/null +++ b/kubernetes/components/namespace/namespace.yaml @@ -0,0 +1,6 @@ +piVersion: v1 +kind: Namespace +metadata: + name: not-used + labels: + kustomize.toolkit.fluxcd.io/prune: disabled