From 1588499c9f7dcbede7d33ef09cb4aa5214c6e3bc Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Wed, 28 Jul 2021 01:57:17 +0200 Subject: [PATCH] refactor: reorganize kustomizations --- cluster/apps/data/kustomization.yaml | 1 + .../data.yaml => apps/data/namespace.yaml} | 0 cluster/apps/development/kustomization.yaml | 1 + .../development/namespace.yaml} | 0 cluster/apps/home-automation/kustomization.yaml | 1 + .../home-automation/namespace.yaml} | 0 cluster/apps/kasten-io/kustomization.yaml | 1 + .../kasten-io/namespace.yaml} | 0 cluster/apps/media/kustomization.yaml | 1 + .../media.yaml => apps/media/namespace.yaml} | 0 cluster/apps/monitoring/kustomization.yaml | 1 + .../monitoring/namespace.yaml} | 0 cluster/apps/networking/kustomization.yaml | 1 + .../networking/namespace.yaml} | 0 cluster/apps/system-upgrade/kustomization.yaml | 1 + .../system-upgrade/namespace.yaml} | 0 .../cert-manager-webhook-ovh-helm-release.yaml | 0 .../cert-manager/cert-manager-webhook-ovh.yaml | 0 .../cert-manager/helm-release.yaml | 0 .../cert-manager/kustomization.yaml | 1 + .../cert-manager/letsencrypt-production.yaml | 0 .../cert-manager/letsencrypt-staging.yaml | 0 .../namespace.yaml} | 0 .../cert-manager/secret.enc.yaml | 0 .../flux => flux-system}/kustomization.yaml | 0 .../monitoring/gitopstoolkit.yaml | 0 .../helm-controller/kustomization.yaml | 0 .../monitoring/helm-controller/podmonitor.yaml | 0 .../monitoring/kustomization.yaml | 0 .../kustomize-controller/kustomization.yaml | 0 .../kustomize-controller/podmonitor.yaml | 0 .../notification-controller/kustomization.yaml | 0 .../notification-controller/podmonitor.yaml | 0 .../source-controller/kustomization.yaml | 0 .../source-controller/podmonitor.yaml | 0 .../notifications/discord/alerts.yaml | 0 .../notifications/discord/kustomization.yaml | 0 .../notifications/discord/provider.yaml | 0 .../notifications/discord/secret.enc.yaml | 0 .../notifications/kustomization.yaml | 0 .../descheduler/helm-release.yaml | 0 .../descheduler/kustomization.yaml | 0 .../intel-gpu-plugin/helm-release.yaml | 0 .../intel-gpu-plugin/kustomization.yaml | 0 .../kubernetes-replicator/helm-release.yaml | 0 .../kubernetes-replicator/kustomization.yaml | 0 .../kured/helm-release.yaml | 0 .../kured/kustomization.yaml | 0 .../kured/prometheus-rule.yaml | 0 .../kustomization.yaml | 5 +---- .../namespace.yaml} | 0 .../node-feature-discovery/helm-release.yaml | 0 .../node-feature-discovery/kustomization.yaml | 0 .../reloader/helm-release.yaml | 0 .../reloader/kustomization.yaml | 0 cluster/core/kustomization.yaml | 7 +++++-- cluster/core/namespaces/default.yaml | 5 ----- cluster/core/namespaces/falco-system.yaml | 5 ----- cluster/core/namespaces/flux-system.yaml | 5 ----- cluster/core/namespaces/kustomization.yaml | 17 ----------------- .../rook-ceph/dashboard/ingress.yaml | 0 .../rook-ceph/dashboard/kustomization.yaml | 0 .../rook-ceph/helm-release.yaml | 0 .../rook-ceph/kustomization.yaml | 1 + .../rook-ceph.yaml => rook-ceph/namespace.yaml} | 0 .../{infrastructure => }/rook-ceph/rbac.yaml | 0 .../rook-ceph/rook-direct-mount/deployment.yaml | 0 .../rook-direct-mount/kustomization.yaml | 0 .../rook-ceph/servicemonitor/csi-metrics.yaml | 0 .../rook-ceph/servicemonitor/kustomization.yaml | 0 .../rook-ceph/servicemonitor/rook-ceph-mgr.yaml | 0 .../snapshot-controller/kustomization.yaml | 0 .../rook-ceph/snapshot-controller/rbac.yaml | 0 .../snapshot-controller/statefulset.yaml | 0 .../rook-ceph/storage/cephblockpool.yaml | 0 .../rook-ceph/storage/cephcluster.yaml | 0 .../rook-ceph/storage/kustomization.yaml | 0 .../rook-ceph/storage/storageclass.yaml | 0 .../rook-ceph/storage/volumesnapshotclass.yaml | 0 .../system-upgrade/deployment.yaml | 0 .../system-upgrade/kustomization.yaml | 0 81 files changed, 16 insertions(+), 38 deletions(-) rename cluster/{core/namespaces/data.yaml => apps/data/namespace.yaml} (100%) rename cluster/{core/namespaces/development.yaml => apps/development/namespace.yaml} (100%) rename cluster/{core/namespaces/home-automation.yaml => apps/home-automation/namespace.yaml} (100%) rename cluster/{core/namespaces/kasten-io.yaml => apps/kasten-io/namespace.yaml} (100%) rename cluster/{core/namespaces/media.yaml => apps/media/namespace.yaml} (100%) rename cluster/{core/namespaces/monitoring.yaml => apps/monitoring/namespace.yaml} (100%) rename cluster/{core/namespaces/networking.yaml => apps/networking/namespace.yaml} (100%) rename cluster/{core/namespaces/system-upgrade.yaml => apps/system-upgrade/namespace.yaml} (100%) rename cluster/core/{infrastructure => }/cert-manager/cert-manager-webhook-ovh-helm-release.yaml (100%) rename cluster/core/{infrastructure => }/cert-manager/cert-manager-webhook-ovh.yaml (100%) rename cluster/core/{infrastructure => }/cert-manager/helm-release.yaml (100%) rename cluster/core/{infrastructure => }/cert-manager/kustomization.yaml (93%) rename cluster/core/{infrastructure => }/cert-manager/letsencrypt-production.yaml (100%) rename cluster/core/{infrastructure => }/cert-manager/letsencrypt-staging.yaml (100%) rename cluster/core/{namespaces/cert-manager.yaml => cert-manager/namespace.yaml} (100%) rename cluster/core/{infrastructure => }/cert-manager/secret.enc.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/kustomization.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/monitoring/gitopstoolkit.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/monitoring/helm-controller/kustomization.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/monitoring/helm-controller/podmonitor.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/monitoring/kustomization.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/monitoring/kustomize-controller/kustomization.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/monitoring/kustomize-controller/podmonitor.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/monitoring/notification-controller/kustomization.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/monitoring/notification-controller/podmonitor.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/monitoring/source-controller/kustomization.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/monitoring/source-controller/podmonitor.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/notifications/discord/alerts.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/notifications/discord/kustomization.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/notifications/discord/provider.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/notifications/discord/secret.enc.yaml (100%) rename cluster/core/{infrastructure/flux => flux-system}/notifications/kustomization.yaml (100%) rename cluster/core/{infrastructure => kube-system}/descheduler/helm-release.yaml (100%) rename cluster/core/{infrastructure => kube-system}/descheduler/kustomization.yaml (100%) rename cluster/core/{infrastructure => kube-system}/intel-gpu-plugin/helm-release.yaml (100%) rename cluster/core/{infrastructure => kube-system}/intel-gpu-plugin/kustomization.yaml (100%) rename cluster/core/{infrastructure => kube-system}/kubernetes-replicator/helm-release.yaml (100%) rename cluster/core/{infrastructure => kube-system}/kubernetes-replicator/kustomization.yaml (100%) rename cluster/core/{infrastructure => kube-system}/kured/helm-release.yaml (100%) rename cluster/core/{infrastructure => kube-system}/kured/kustomization.yaml (100%) rename cluster/core/{infrastructure => kube-system}/kured/prometheus-rule.yaml (100%) rename cluster/core/{infrastructure => kube-system}/kustomization.yaml (76%) rename cluster/core/{namespaces/kube-system.yaml => kube-system/namespace.yaml} (100%) rename cluster/core/{infrastructure => kube-system}/node-feature-discovery/helm-release.yaml (100%) rename cluster/core/{infrastructure => kube-system}/node-feature-discovery/kustomization.yaml (100%) rename cluster/core/{infrastructure => kube-system}/reloader/helm-release.yaml (100%) rename cluster/core/{infrastructure => kube-system}/reloader/kustomization.yaml (100%) delete mode 100644 cluster/core/namespaces/default.yaml delete mode 100644 cluster/core/namespaces/falco-system.yaml delete mode 100644 cluster/core/namespaces/flux-system.yaml delete mode 100644 cluster/core/namespaces/kustomization.yaml rename cluster/core/{infrastructure => }/rook-ceph/dashboard/ingress.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/dashboard/kustomization.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/helm-release.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/kustomization.yaml (91%) rename cluster/core/{namespaces/rook-ceph.yaml => rook-ceph/namespace.yaml} (100%) rename cluster/core/{infrastructure => }/rook-ceph/rbac.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/rook-direct-mount/deployment.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/rook-direct-mount/kustomization.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/servicemonitor/csi-metrics.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/servicemonitor/kustomization.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/servicemonitor/rook-ceph-mgr.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/snapshot-controller/kustomization.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/snapshot-controller/rbac.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/snapshot-controller/statefulset.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/storage/cephblockpool.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/storage/cephcluster.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/storage/kustomization.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/storage/storageclass.yaml (100%) rename cluster/core/{infrastructure => }/rook-ceph/storage/volumesnapshotclass.yaml (100%) rename cluster/core/{infrastructure => }/system-upgrade/deployment.yaml (100%) rename cluster/core/{infrastructure => }/system-upgrade/kustomization.yaml (100%) diff --git a/cluster/apps/data/kustomization.yaml b/cluster/apps/data/kustomization.yaml index 604afbeae..bbe509e64 100644 --- a/cluster/apps/data/kustomization.yaml +++ b/cluster/apps/data/kustomization.yaml @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - bookstack - forecastle - freshrss diff --git a/cluster/core/namespaces/data.yaml b/cluster/apps/data/namespace.yaml similarity index 100% rename from cluster/core/namespaces/data.yaml rename to cluster/apps/data/namespace.yaml diff --git a/cluster/apps/development/kustomization.yaml b/cluster/apps/development/kustomization.yaml index f85f8fb4a..2c31e8fb5 100644 --- a/cluster/apps/development/kustomization.yaml +++ b/cluster/apps/development/kustomization.yaml @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - docker-registry - drone - drone-runner-kube diff --git a/cluster/core/namespaces/development.yaml b/cluster/apps/development/namespace.yaml similarity index 100% rename from cluster/core/namespaces/development.yaml rename to cluster/apps/development/namespace.yaml diff --git a/cluster/apps/home-automation/kustomization.yaml b/cluster/apps/home-automation/kustomization.yaml index 92490affb..14b2593ff 100644 --- a/cluster/apps/home-automation/kustomization.yaml +++ b/cluster/apps/home-automation/kustomization.yaml @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - emqx - frigate - home-assistant diff --git a/cluster/core/namespaces/home-automation.yaml b/cluster/apps/home-automation/namespace.yaml similarity index 100% rename from cluster/core/namespaces/home-automation.yaml rename to cluster/apps/home-automation/namespace.yaml diff --git a/cluster/apps/kasten-io/kustomization.yaml b/cluster/apps/kasten-io/kustomization.yaml index 8ece812ab..b7fd1d13d 100644 --- a/cluster/apps/kasten-io/kustomization.yaml +++ b/cluster/apps/kasten-io/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - k10 diff --git a/cluster/core/namespaces/kasten-io.yaml b/cluster/apps/kasten-io/namespace.yaml similarity index 100% rename from cluster/core/namespaces/kasten-io.yaml rename to cluster/apps/kasten-io/namespace.yaml diff --git a/cluster/apps/media/kustomization.yaml b/cluster/apps/media/kustomization.yaml index 3d68aeb9e..e7e6b2944 100644 --- a/cluster/apps/media/kustomization.yaml +++ b/cluster/apps/media/kustomization.yaml @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - bazarr - flood - jellyfin diff --git a/cluster/core/namespaces/media.yaml b/cluster/apps/media/namespace.yaml similarity index 100% rename from cluster/core/namespaces/media.yaml rename to cluster/apps/media/namespace.yaml diff --git a/cluster/apps/monitoring/kustomization.yaml b/cluster/apps/monitoring/kustomization.yaml index 22a107b03..d93b110d6 100644 --- a/cluster/apps/monitoring/kustomization.yaml +++ b/cluster/apps/monitoring/kustomization.yaml @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - blackbox-exporter - botkube - healthchecks diff --git a/cluster/core/namespaces/monitoring.yaml b/cluster/apps/monitoring/namespace.yaml similarity index 100% rename from cluster/core/namespaces/monitoring.yaml rename to cluster/apps/monitoring/namespace.yaml diff --git a/cluster/apps/networking/kustomization.yaml b/cluster/apps/networking/kustomization.yaml index 39024ea04..6ca4c7399 100644 --- a/cluster/apps/networking/kustomization.yaml +++ b/cluster/apps/networking/kustomization.yaml @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - authelia - certificate - ingress-nginx diff --git a/cluster/core/namespaces/networking.yaml b/cluster/apps/networking/namespace.yaml similarity index 100% rename from cluster/core/namespaces/networking.yaml rename to cluster/apps/networking/namespace.yaml diff --git a/cluster/apps/system-upgrade/kustomization.yaml b/cluster/apps/system-upgrade/kustomization.yaml index 457c088e9..1f6efc213 100644 --- a/cluster/apps/system-upgrade/kustomization.yaml +++ b/cluster/apps/system-upgrade/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - server-plan.yaml - worker-plan.yaml diff --git a/cluster/core/namespaces/system-upgrade.yaml b/cluster/apps/system-upgrade/namespace.yaml similarity index 100% rename from cluster/core/namespaces/system-upgrade.yaml rename to cluster/apps/system-upgrade/namespace.yaml diff --git a/cluster/core/infrastructure/cert-manager/cert-manager-webhook-ovh-helm-release.yaml b/cluster/core/cert-manager/cert-manager-webhook-ovh-helm-release.yaml similarity index 100% rename from cluster/core/infrastructure/cert-manager/cert-manager-webhook-ovh-helm-release.yaml rename to cluster/core/cert-manager/cert-manager-webhook-ovh-helm-release.yaml diff --git a/cluster/core/infrastructure/cert-manager/cert-manager-webhook-ovh.yaml b/cluster/core/cert-manager/cert-manager-webhook-ovh.yaml similarity index 100% rename from cluster/core/infrastructure/cert-manager/cert-manager-webhook-ovh.yaml rename to cluster/core/cert-manager/cert-manager-webhook-ovh.yaml diff --git a/cluster/core/infrastructure/cert-manager/helm-release.yaml b/cluster/core/cert-manager/helm-release.yaml similarity index 100% rename from cluster/core/infrastructure/cert-manager/helm-release.yaml rename to cluster/core/cert-manager/helm-release.yaml diff --git a/cluster/core/infrastructure/cert-manager/kustomization.yaml b/cluster/core/cert-manager/kustomization.yaml similarity index 93% rename from cluster/core/infrastructure/cert-manager/kustomization.yaml rename to cluster/core/cert-manager/kustomization.yaml index 1d559a5b8..bb55e8eb0 100644 --- a/cluster/core/infrastructure/cert-manager/kustomization.yaml +++ b/cluster/core/cert-manager/kustomization.yaml @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - helm-release.yaml - cert-manager-webhook-ovh.yaml - cert-manager-webhook-ovh-helm-release.yaml diff --git a/cluster/core/infrastructure/cert-manager/letsencrypt-production.yaml b/cluster/core/cert-manager/letsencrypt-production.yaml similarity index 100% rename from cluster/core/infrastructure/cert-manager/letsencrypt-production.yaml rename to cluster/core/cert-manager/letsencrypt-production.yaml diff --git a/cluster/core/infrastructure/cert-manager/letsencrypt-staging.yaml b/cluster/core/cert-manager/letsencrypt-staging.yaml similarity index 100% rename from cluster/core/infrastructure/cert-manager/letsencrypt-staging.yaml rename to cluster/core/cert-manager/letsencrypt-staging.yaml diff --git a/cluster/core/namespaces/cert-manager.yaml b/cluster/core/cert-manager/namespace.yaml similarity index 100% rename from cluster/core/namespaces/cert-manager.yaml rename to cluster/core/cert-manager/namespace.yaml diff --git a/cluster/core/infrastructure/cert-manager/secret.enc.yaml b/cluster/core/cert-manager/secret.enc.yaml similarity index 100% rename from cluster/core/infrastructure/cert-manager/secret.enc.yaml rename to cluster/core/cert-manager/secret.enc.yaml diff --git a/cluster/core/infrastructure/flux/kustomization.yaml b/cluster/core/flux-system/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/flux/kustomization.yaml rename to cluster/core/flux-system/kustomization.yaml diff --git a/cluster/core/infrastructure/flux/monitoring/gitopstoolkit.yaml b/cluster/core/flux-system/monitoring/gitopstoolkit.yaml similarity index 100% rename from cluster/core/infrastructure/flux/monitoring/gitopstoolkit.yaml rename to cluster/core/flux-system/monitoring/gitopstoolkit.yaml diff --git a/cluster/core/infrastructure/flux/monitoring/helm-controller/kustomization.yaml b/cluster/core/flux-system/monitoring/helm-controller/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/flux/monitoring/helm-controller/kustomization.yaml rename to cluster/core/flux-system/monitoring/helm-controller/kustomization.yaml diff --git a/cluster/core/infrastructure/flux/monitoring/helm-controller/podmonitor.yaml b/cluster/core/flux-system/monitoring/helm-controller/podmonitor.yaml similarity index 100% rename from cluster/core/infrastructure/flux/monitoring/helm-controller/podmonitor.yaml rename to cluster/core/flux-system/monitoring/helm-controller/podmonitor.yaml diff --git a/cluster/core/infrastructure/flux/monitoring/kustomization.yaml b/cluster/core/flux-system/monitoring/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/flux/monitoring/kustomization.yaml rename to cluster/core/flux-system/monitoring/kustomization.yaml diff --git a/cluster/core/infrastructure/flux/monitoring/kustomize-controller/kustomization.yaml b/cluster/core/flux-system/monitoring/kustomize-controller/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/flux/monitoring/kustomize-controller/kustomization.yaml rename to cluster/core/flux-system/monitoring/kustomize-controller/kustomization.yaml diff --git a/cluster/core/infrastructure/flux/monitoring/kustomize-controller/podmonitor.yaml b/cluster/core/flux-system/monitoring/kustomize-controller/podmonitor.yaml similarity index 100% rename from cluster/core/infrastructure/flux/monitoring/kustomize-controller/podmonitor.yaml rename to cluster/core/flux-system/monitoring/kustomize-controller/podmonitor.yaml diff --git a/cluster/core/infrastructure/flux/monitoring/notification-controller/kustomization.yaml b/cluster/core/flux-system/monitoring/notification-controller/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/flux/monitoring/notification-controller/kustomization.yaml rename to cluster/core/flux-system/monitoring/notification-controller/kustomization.yaml diff --git a/cluster/core/infrastructure/flux/monitoring/notification-controller/podmonitor.yaml b/cluster/core/flux-system/monitoring/notification-controller/podmonitor.yaml similarity index 100% rename from cluster/core/infrastructure/flux/monitoring/notification-controller/podmonitor.yaml rename to cluster/core/flux-system/monitoring/notification-controller/podmonitor.yaml diff --git a/cluster/core/infrastructure/flux/monitoring/source-controller/kustomization.yaml b/cluster/core/flux-system/monitoring/source-controller/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/flux/monitoring/source-controller/kustomization.yaml rename to cluster/core/flux-system/monitoring/source-controller/kustomization.yaml diff --git a/cluster/core/infrastructure/flux/monitoring/source-controller/podmonitor.yaml b/cluster/core/flux-system/monitoring/source-controller/podmonitor.yaml similarity index 100% rename from cluster/core/infrastructure/flux/monitoring/source-controller/podmonitor.yaml rename to cluster/core/flux-system/monitoring/source-controller/podmonitor.yaml diff --git a/cluster/core/infrastructure/flux/notifications/discord/alerts.yaml b/cluster/core/flux-system/notifications/discord/alerts.yaml similarity index 100% rename from cluster/core/infrastructure/flux/notifications/discord/alerts.yaml rename to cluster/core/flux-system/notifications/discord/alerts.yaml diff --git a/cluster/core/infrastructure/flux/notifications/discord/kustomization.yaml b/cluster/core/flux-system/notifications/discord/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/flux/notifications/discord/kustomization.yaml rename to cluster/core/flux-system/notifications/discord/kustomization.yaml diff --git a/cluster/core/infrastructure/flux/notifications/discord/provider.yaml b/cluster/core/flux-system/notifications/discord/provider.yaml similarity index 100% rename from cluster/core/infrastructure/flux/notifications/discord/provider.yaml rename to cluster/core/flux-system/notifications/discord/provider.yaml diff --git a/cluster/core/infrastructure/flux/notifications/discord/secret.enc.yaml b/cluster/core/flux-system/notifications/discord/secret.enc.yaml similarity index 100% rename from cluster/core/infrastructure/flux/notifications/discord/secret.enc.yaml rename to cluster/core/flux-system/notifications/discord/secret.enc.yaml diff --git a/cluster/core/infrastructure/flux/notifications/kustomization.yaml b/cluster/core/flux-system/notifications/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/flux/notifications/kustomization.yaml rename to cluster/core/flux-system/notifications/kustomization.yaml diff --git a/cluster/core/infrastructure/descheduler/helm-release.yaml b/cluster/core/kube-system/descheduler/helm-release.yaml similarity index 100% rename from cluster/core/infrastructure/descheduler/helm-release.yaml rename to cluster/core/kube-system/descheduler/helm-release.yaml diff --git a/cluster/core/infrastructure/descheduler/kustomization.yaml b/cluster/core/kube-system/descheduler/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/descheduler/kustomization.yaml rename to cluster/core/kube-system/descheduler/kustomization.yaml diff --git a/cluster/core/infrastructure/intel-gpu-plugin/helm-release.yaml b/cluster/core/kube-system/intel-gpu-plugin/helm-release.yaml similarity index 100% rename from cluster/core/infrastructure/intel-gpu-plugin/helm-release.yaml rename to cluster/core/kube-system/intel-gpu-plugin/helm-release.yaml diff --git a/cluster/core/infrastructure/intel-gpu-plugin/kustomization.yaml b/cluster/core/kube-system/intel-gpu-plugin/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/intel-gpu-plugin/kustomization.yaml rename to cluster/core/kube-system/intel-gpu-plugin/kustomization.yaml diff --git a/cluster/core/infrastructure/kubernetes-replicator/helm-release.yaml b/cluster/core/kube-system/kubernetes-replicator/helm-release.yaml similarity index 100% rename from cluster/core/infrastructure/kubernetes-replicator/helm-release.yaml rename to cluster/core/kube-system/kubernetes-replicator/helm-release.yaml diff --git a/cluster/core/infrastructure/kubernetes-replicator/kustomization.yaml b/cluster/core/kube-system/kubernetes-replicator/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/kubernetes-replicator/kustomization.yaml rename to cluster/core/kube-system/kubernetes-replicator/kustomization.yaml diff --git a/cluster/core/infrastructure/kured/helm-release.yaml b/cluster/core/kube-system/kured/helm-release.yaml similarity index 100% rename from cluster/core/infrastructure/kured/helm-release.yaml rename to cluster/core/kube-system/kured/helm-release.yaml diff --git a/cluster/core/infrastructure/kured/kustomization.yaml b/cluster/core/kube-system/kured/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/kured/kustomization.yaml rename to cluster/core/kube-system/kured/kustomization.yaml diff --git a/cluster/core/infrastructure/kured/prometheus-rule.yaml b/cluster/core/kube-system/kured/prometheus-rule.yaml similarity index 100% rename from cluster/core/infrastructure/kured/prometheus-rule.yaml rename to cluster/core/kube-system/kured/prometheus-rule.yaml diff --git a/cluster/core/infrastructure/kustomization.yaml b/cluster/core/kube-system/kustomization.yaml similarity index 76% rename from cluster/core/infrastructure/kustomization.yaml rename to cluster/core/kube-system/kustomization.yaml index d25f012b1..6b430735f 100644 --- a/cluster/core/infrastructure/kustomization.yaml +++ b/cluster/core/kube-system/kustomization.yaml @@ -1,13 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - cert-manager + - namespace.yaml - descheduler - - flux - intel-gpu-plugin - kubernetes-replicator - kured - node-feature-discovery - reloader - - rook-ceph - - system-upgrade diff --git a/cluster/core/namespaces/kube-system.yaml b/cluster/core/kube-system/namespace.yaml similarity index 100% rename from cluster/core/namespaces/kube-system.yaml rename to cluster/core/kube-system/namespace.yaml diff --git a/cluster/core/infrastructure/node-feature-discovery/helm-release.yaml b/cluster/core/kube-system/node-feature-discovery/helm-release.yaml similarity index 100% rename from cluster/core/infrastructure/node-feature-discovery/helm-release.yaml rename to cluster/core/kube-system/node-feature-discovery/helm-release.yaml diff --git a/cluster/core/infrastructure/node-feature-discovery/kustomization.yaml b/cluster/core/kube-system/node-feature-discovery/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/node-feature-discovery/kustomization.yaml rename to cluster/core/kube-system/node-feature-discovery/kustomization.yaml diff --git a/cluster/core/infrastructure/reloader/helm-release.yaml b/cluster/core/kube-system/reloader/helm-release.yaml similarity index 100% rename from cluster/core/infrastructure/reloader/helm-release.yaml rename to cluster/core/kube-system/reloader/helm-release.yaml diff --git a/cluster/core/infrastructure/reloader/kustomization.yaml b/cluster/core/kube-system/reloader/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/reloader/kustomization.yaml rename to cluster/core/kube-system/reloader/kustomization.yaml diff --git a/cluster/core/kustomization.yaml b/cluster/core/kustomization.yaml index ae91817e0..0e700b1c5 100644 --- a/cluster/core/kustomization.yaml +++ b/cluster/core/kustomization.yaml @@ -1,5 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - namespaces - - infrastructure + - cert-manager + - flux-system + - kube-system + - rook-ceph + - system-upgrade diff --git a/cluster/core/namespaces/default.yaml b/cluster/core/namespaces/default.yaml deleted file mode 100644 index 05afb8325..000000000 --- a/cluster/core/namespaces/default.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: default diff --git a/cluster/core/namespaces/falco-system.yaml b/cluster/core/namespaces/falco-system.yaml deleted file mode 100644 index 1d5d00dad..000000000 --- a/cluster/core/namespaces/falco-system.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: falco-system diff --git a/cluster/core/namespaces/flux-system.yaml b/cluster/core/namespaces/flux-system.yaml deleted file mode 100644 index 378ec6855..000000000 --- a/cluster/core/namespaces/flux-system.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: flux-system diff --git a/cluster/core/namespaces/kustomization.yaml b/cluster/core/namespaces/kustomization.yaml deleted file mode 100644 index e6e1debda..000000000 --- a/cluster/core/namespaces/kustomization.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - cert-manager.yaml - - data.yaml - - default.yaml - - development.yaml - - falco-system.yaml - - flux-system.yaml - - home-automation.yaml - - kasten-io.yaml - - kube-system.yaml - - media.yaml - - monitoring.yaml - - networking.yaml - - rook-ceph.yaml - - system-upgrade.yaml diff --git a/cluster/core/infrastructure/rook-ceph/dashboard/ingress.yaml b/cluster/core/rook-ceph/dashboard/ingress.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/dashboard/ingress.yaml rename to cluster/core/rook-ceph/dashboard/ingress.yaml diff --git a/cluster/core/infrastructure/rook-ceph/dashboard/kustomization.yaml b/cluster/core/rook-ceph/dashboard/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/dashboard/kustomization.yaml rename to cluster/core/rook-ceph/dashboard/kustomization.yaml diff --git a/cluster/core/infrastructure/rook-ceph/helm-release.yaml b/cluster/core/rook-ceph/helm-release.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/helm-release.yaml rename to cluster/core/rook-ceph/helm-release.yaml diff --git a/cluster/core/infrastructure/rook-ceph/kustomization.yaml b/cluster/core/rook-ceph/kustomization.yaml similarity index 91% rename from cluster/core/infrastructure/rook-ceph/kustomization.yaml rename to cluster/core/rook-ceph/kustomization.yaml index 12388693f..1c5218d15 100644 --- a/cluster/core/infrastructure/rook-ceph/kustomization.yaml +++ b/cluster/core/rook-ceph/kustomization.yaml @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - rbac.yaml - helm-release.yaml - storage diff --git a/cluster/core/namespaces/rook-ceph.yaml b/cluster/core/rook-ceph/namespace.yaml similarity index 100% rename from cluster/core/namespaces/rook-ceph.yaml rename to cluster/core/rook-ceph/namespace.yaml diff --git a/cluster/core/infrastructure/rook-ceph/rbac.yaml b/cluster/core/rook-ceph/rbac.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/rbac.yaml rename to cluster/core/rook-ceph/rbac.yaml diff --git a/cluster/core/infrastructure/rook-ceph/rook-direct-mount/deployment.yaml b/cluster/core/rook-ceph/rook-direct-mount/deployment.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/rook-direct-mount/deployment.yaml rename to cluster/core/rook-ceph/rook-direct-mount/deployment.yaml diff --git a/cluster/core/infrastructure/rook-ceph/rook-direct-mount/kustomization.yaml b/cluster/core/rook-ceph/rook-direct-mount/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/rook-direct-mount/kustomization.yaml rename to cluster/core/rook-ceph/rook-direct-mount/kustomization.yaml diff --git a/cluster/core/infrastructure/rook-ceph/servicemonitor/csi-metrics.yaml b/cluster/core/rook-ceph/servicemonitor/csi-metrics.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/servicemonitor/csi-metrics.yaml rename to cluster/core/rook-ceph/servicemonitor/csi-metrics.yaml diff --git a/cluster/core/infrastructure/rook-ceph/servicemonitor/kustomization.yaml b/cluster/core/rook-ceph/servicemonitor/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/servicemonitor/kustomization.yaml rename to cluster/core/rook-ceph/servicemonitor/kustomization.yaml diff --git a/cluster/core/infrastructure/rook-ceph/servicemonitor/rook-ceph-mgr.yaml b/cluster/core/rook-ceph/servicemonitor/rook-ceph-mgr.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/servicemonitor/rook-ceph-mgr.yaml rename to cluster/core/rook-ceph/servicemonitor/rook-ceph-mgr.yaml diff --git a/cluster/core/infrastructure/rook-ceph/snapshot-controller/kustomization.yaml b/cluster/core/rook-ceph/snapshot-controller/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/snapshot-controller/kustomization.yaml rename to cluster/core/rook-ceph/snapshot-controller/kustomization.yaml diff --git a/cluster/core/infrastructure/rook-ceph/snapshot-controller/rbac.yaml b/cluster/core/rook-ceph/snapshot-controller/rbac.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/snapshot-controller/rbac.yaml rename to cluster/core/rook-ceph/snapshot-controller/rbac.yaml diff --git a/cluster/core/infrastructure/rook-ceph/snapshot-controller/statefulset.yaml b/cluster/core/rook-ceph/snapshot-controller/statefulset.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/snapshot-controller/statefulset.yaml rename to cluster/core/rook-ceph/snapshot-controller/statefulset.yaml diff --git a/cluster/core/infrastructure/rook-ceph/storage/cephblockpool.yaml b/cluster/core/rook-ceph/storage/cephblockpool.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/storage/cephblockpool.yaml rename to cluster/core/rook-ceph/storage/cephblockpool.yaml diff --git a/cluster/core/infrastructure/rook-ceph/storage/cephcluster.yaml b/cluster/core/rook-ceph/storage/cephcluster.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/storage/cephcluster.yaml rename to cluster/core/rook-ceph/storage/cephcluster.yaml diff --git a/cluster/core/infrastructure/rook-ceph/storage/kustomization.yaml b/cluster/core/rook-ceph/storage/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/storage/kustomization.yaml rename to cluster/core/rook-ceph/storage/kustomization.yaml diff --git a/cluster/core/infrastructure/rook-ceph/storage/storageclass.yaml b/cluster/core/rook-ceph/storage/storageclass.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/storage/storageclass.yaml rename to cluster/core/rook-ceph/storage/storageclass.yaml diff --git a/cluster/core/infrastructure/rook-ceph/storage/volumesnapshotclass.yaml b/cluster/core/rook-ceph/storage/volumesnapshotclass.yaml similarity index 100% rename from cluster/core/infrastructure/rook-ceph/storage/volumesnapshotclass.yaml rename to cluster/core/rook-ceph/storage/volumesnapshotclass.yaml diff --git a/cluster/core/infrastructure/system-upgrade/deployment.yaml b/cluster/core/system-upgrade/deployment.yaml similarity index 100% rename from cluster/core/infrastructure/system-upgrade/deployment.yaml rename to cluster/core/system-upgrade/deployment.yaml diff --git a/cluster/core/infrastructure/system-upgrade/kustomization.yaml b/cluster/core/system-upgrade/kustomization.yaml similarity index 100% rename from cluster/core/infrastructure/system-upgrade/kustomization.yaml rename to cluster/core/system-upgrade/kustomization.yaml