Move all controllers to infrastructure-controllers

devantler · Sep 28, 2024 · 472cd4b · 472cd4b
1 parent 445e875
commit 472cd4b
Show file tree

Hide file tree

Showing 71 changed files with 20 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -148,7 +148,7 @@ The cluster configuration is stored in the `k8s/*` directories where the structu
     - [Homepage](k8s/shared/apps/homepage) - To provide a dashborad for the cluster.
     - [Open WebUI](k8s/shared/apps/open-webui) - To provide a web interface and a REST API for interacting with LLM's.
     - [PlantUML](k8s/shared/infrastructure/plantuml) - To provide a web interface and a REST API for generating PlantUML diagrams.
-    - [Traefik](k8s/shared/infrastructure/traefik) - To provide an ingress controller for the cluster.
+    - [Traefik](k8s/shared/infrastructure/controllers/traefik) - To provide an ingress controller for the cluster.
   - [`custom-resources/`](k8s/shared/custom-resources): Contains the custom resources that are used across the cluster.
     - [Middlewares](k8s/shared/custom-resources/middlewares) - Contains the middlewares that are used by Traefik.
     - [Selfsigned Cluster Issuer](k8s/shared/custom-resources/selfsigned-cluster-issuer) - Contains the selfsigned cluster issuer that is used by Traefik.
@@ -159,18 +159,18 @@ The cluster configuration is stored in the `k8s/*` directories where the structu
     - [Cluster API Operator](k8s/shared/infrastructure/capi-operator) - For managing the lifecycle of Kubernetes clusters.
     - [GitHub Actions Runner Scale Set Controller](k8s/shared/infrastructure/gha-runner-scale-set-controller) - To manage GitHub Actions Runner Scale Sets in the cluster.
     - [GitHub Actions Runner Scale Sets](k8s/clusters/homelab-prod/infrastructure/gha-runner-scale-sets) - To run GitHub Actions in the cluster.
-    - [Goldilocks](k8s/shared/infrastructure/goldilocks) - To provide and apply resource recommendations for pods.
+    - [Goldilocks](k8s/shared/infrastructure/controllers/goldilocks) - To provide and apply resource recommendations for pods.
     - [Harbor](k8s/shared/infrastructure/harbor) - To store and distribute container images.
-    - [K8sGPT Operator](k8s/shared/infrastructure/k8sgpt-operator) - To analyze the cluster for improvements, vulnerabilities or bugs.
+    - [K8sGPT Operator](k8s/shared/infrastructure/controllers/k8sgpt-operator) - To analyze the cluster for improvements, vulnerabilities or bugs.
     - [Kube Prometheus Stack](k8s/shared/infrastructure/kube-prometheus-stack) - To provide monitoring for the cluster. (Prometheus, Grafana, Alertmanager, etc.)
-    - [Kyverno](k8s/shared/infrastructure/kyverno) - To enforce policies in the cluster.
+    - [Kyverno](k8s/shared/infrastructure/controllers/kyverno) - To enforce policies in the cluster.
     - [Longhorn](k8s/distributions/talos/core/longhorn) - To provide distributed storage for the cluster.
-    - [Metrics Server](k8s/shared/infrastructure/metrics-server) - To provide metrics for the cluster.
+    - [Metrics Server](k8s/shared/infrastructure/controllers/metrics-server) - To provide metrics for the cluster.
     - [OAuth2 Proxy](k8s/shared/infrastructure/oauth2-proxy) - To provide authentication for the cluster.
     - [Ollama](k8s/shared/infrastructure/ollama) - To run LLM's on the cluster.
-    - [Reloader](k8s/shared/infrastructure/reloader) - To reload deployments when secrets or configmaps change.
-    - [Testkube](k8s/shared/infrastructure/testkube) - To provide a testing framework for the cluster.
-    - [Trivy Operator](k8s/shared/infrastructure/trivy-operator) - To analyze the cluster for vulnerabilities.
+    - [Reloader](k8s/shared/infrastructure/controllers/reloader) - To reload deployments when secrets or configmaps change.
+    - [Testkube](k8s/shared/infrastructure/controllers/testkube) - To provide a testing framework for the cluster.
+    - [Trivy Operator](k8s/shared/infrastructure/controllers/trivy-operator) - To analyze the cluster for vulnerabilities.
   - [`tenants`](k8s/shared/tenants): Contains Flux kustomizations to bootstrap and onboard tenants. (currently not in use)
   - [`variables/`](k8s/shared/variables): Contains global variables, that are the same for all clusters.
 

diff --git a/...ed/infrastructure/capi-operator/README.md → ...cture/controllers/capi-operator/README.md b/...ed/infrastructure/capi-operator/README.md → ...cture/controllers/capi-operator/README.md
diff --git a/...structure/capi-operator/helm-release.yaml → ...ntrollers/capi-operator/helm-release.yaml b/...structure/capi-operator/helm-release.yaml → ...ntrollers/capi-operator/helm-release.yaml
diff --git a/...ucture/capi-operator/helm-repository.yaml → ...ollers/capi-operator/helm-repository.yaml b/...ucture/capi-operator/helm-repository.yaml → ...ollers/capi-operator/helm-repository.yaml
diff --git a/...tructure/capi-operator/kustomization.yaml → ...trollers/capi-operator/kustomization.yaml b/...tructure/capi-operator/kustomization.yaml → ...trollers/capi-operator/kustomization.yaml
diff --git a/...frastructure/capi-operator/namespace.yaml → .../controllers/capi-operator/namespace.yaml b/...frastructure/capi-operator/namespace.yaml → .../controllers/capi-operator/namespace.yaml
diff --git a/...red/infrastructure/cert-manager/README.md → ...ucture/controllers/cert-manager/README.md b/...red/infrastructure/cert-manager/README.md → ...ucture/controllers/cert-manager/README.md
diff --git a/...astructure/cert-manager/helm-release.yaml → ...ontrollers/cert-manager/helm-release.yaml b/...astructure/cert-manager/helm-release.yaml → ...ontrollers/cert-manager/helm-release.yaml
diff --git a/...ructure/cert-manager/helm-repository.yaml → ...rollers/cert-manager/helm-repository.yaml b/...ructure/cert-manager/helm-repository.yaml → ...rollers/cert-manager/helm-repository.yaml
diff --git a/...structure/cert-manager/kustomization.yaml → ...ntrollers/cert-manager/kustomization.yaml b/...structure/cert-manager/kustomization.yaml → ...ntrollers/cert-manager/kustomization.yaml
diff --git a/...nfrastructure/cert-manager/namespace.yaml → ...e/controllers/cert-manager/namespace.yaml b/...nfrastructure/cert-manager/namespace.yaml → ...e/controllers/cert-manager/namespace.yaml
diff --git a/...gha-runner-scale-set-controller/README.md → ...gha-runner-scale-set-controller/README.md b/...gha-runner-scale-set-controller/README.md → ...gha-runner-scale-set-controller/README.md
diff --git a/...er-scale-set-controller/helm-release.yaml → ...er-scale-set-controller/helm-release.yaml b/...er-scale-set-controller/helm-release.yaml → ...er-scale-set-controller/helm-release.yaml
diff --git a/...scale-set-controller/helm-repository.yaml → ...scale-set-controller/helm-repository.yaml b/...scale-set-controller/helm-repository.yaml → ...scale-set-controller/helm-repository.yaml
diff --git a/...r-scale-set-controller/kustomization.yaml → ...r-scale-set-controller/kustomization.yaml b/...r-scale-set-controller/kustomization.yaml → ...r-scale-set-controller/kustomization.yaml
diff --git a/...unner-scale-set-controller/namespace.yaml → ...unner-scale-set-controller/namespace.yaml b/...unner-scale-set-controller/namespace.yaml → ...unner-scale-set-controller/namespace.yaml
diff --git a/...hared/infrastructure/goldilocks/README.md → ...tructure/controllers/goldilocks/README.md b/...hared/infrastructure/goldilocks/README.md → ...tructure/controllers/goldilocks/README.md
diff --git a/...frastructure/goldilocks/helm-release.yaml → .../controllers/goldilocks/helm-release.yaml b/...frastructure/goldilocks/helm-release.yaml → .../controllers/goldilocks/helm-release.yaml
diff --git a/...structure/goldilocks/helm-repository.yaml → ...ntrollers/goldilocks/helm-repository.yaml b/...structure/goldilocks/helm-repository.yaml → ...ntrollers/goldilocks/helm-repository.yaml
diff --git a/...rastructure/goldilocks/kustomization.yaml → ...controllers/goldilocks/kustomization.yaml b/...rastructure/goldilocks/kustomization.yaml → ...controllers/goldilocks/kustomization.yaml
diff --git a/.../infrastructure/goldilocks/namespace.yaml → ...ure/controllers/goldilocks/namespace.yaml b/.../infrastructure/goldilocks/namespace.yaml → ...ure/controllers/goldilocks/namespace.yaml
diff --git a/.../infrastructure/k8sgpt-operator/README.md → ...ure/controllers/k8sgpt-operator/README.md b/.../infrastructure/k8sgpt-operator/README.md → ...ure/controllers/k8sgpt-operator/README.md
diff --git a/...ructure/k8sgpt-operator/helm-release.yaml → ...rollers/k8sgpt-operator/helm-release.yaml b/...ructure/k8sgpt-operator/helm-release.yaml → ...rollers/k8sgpt-operator/helm-release.yaml
diff --git a/...ture/k8sgpt-operator/helm-repository.yaml → ...lers/k8sgpt-operator/helm-repository.yaml b/...ture/k8sgpt-operator/helm-repository.yaml → ...lers/k8sgpt-operator/helm-repository.yaml
diff --git a/...ucture/k8sgpt-operator/kustomization.yaml → ...ollers/k8sgpt-operator/kustomization.yaml b/...ucture/k8sgpt-operator/kustomization.yaml → ...ollers/k8sgpt-operator/kustomization.yaml
diff --git a/...astructure/k8sgpt-operator/namespace.yaml → ...ontrollers/k8sgpt-operator/namespace.yaml b/...astructure/k8sgpt-operator/namespace.yaml → ...ontrollers/k8sgpt-operator/namespace.yaml
diff --git a/k8s/shared/infrastructure/controllers/kustomization.yaml b/k8s/shared/infrastructure/controllers/kustomization.yaml
@@ -1,6 +1,17 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources: []
+resources:
+  - capi-operator
+  - cert-manager
+  - gha-runner-scale-set-controller
+  - goldilocks
+  - kyverno
+  - metrics-server
+  - reloader
+  #- testkube
+  - traefik
+  - trivy-operator
+  # - k8sgpt-operator
 
 components:
   - ../../../components/helm-release-crds-label

diff --git a/k8s/shared/infrastructure/kyverno/README.md → ...rastructure/controllers/kyverno/README.md b/k8s/shared/infrastructure/kyverno/README.md → ...rastructure/controllers/kyverno/README.md
diff --git a/.../infrastructure/kyverno/helm-release.yaml → ...ure/controllers/kyverno/helm-release.yaml b/.../infrastructure/kyverno/helm-release.yaml → ...ure/controllers/kyverno/helm-release.yaml
diff --git a/...frastructure/kyverno/helm-repository.yaml → .../controllers/kyverno/helm-repository.yaml b/...frastructure/kyverno/helm-repository.yaml → .../controllers/kyverno/helm-repository.yaml
diff --git a/...infrastructure/kyverno/kustomization.yaml → ...re/controllers/kyverno/kustomization.yaml b/...infrastructure/kyverno/kustomization.yaml → ...re/controllers/kyverno/kustomization.yaml
diff --git a/...red/infrastructure/kyverno/namespace.yaml → ...ucture/controllers/kyverno/namespace.yaml b/...red/infrastructure/kyverno/namespace.yaml → ...ucture/controllers/kyverno/namespace.yaml
diff --git a/...d/infrastructure/metrics-server/README.md → ...ture/controllers/metrics-server/README.md b/...d/infrastructure/metrics-server/README.md → ...ture/controllers/metrics-server/README.md
diff --git a/...tructure/metrics-server/helm-release.yaml → ...trollers/metrics-server/helm-release.yaml b/...tructure/metrics-server/helm-release.yaml → ...trollers/metrics-server/helm-release.yaml
diff --git a/...cture/metrics-server/helm-repository.yaml → ...llers/metrics-server/helm-repository.yaml b/...cture/metrics-server/helm-repository.yaml → ...llers/metrics-server/helm-repository.yaml
diff --git a/...ructure/metrics-server/kustomization.yaml → ...rollers/metrics-server/kustomization.yaml b/...ructure/metrics-server/kustomization.yaml → ...rollers/metrics-server/kustomization.yaml
diff --git a/k8s/shared/infrastructure/reloader/README.md → ...astructure/controllers/reloader/README.md b/k8s/shared/infrastructure/reloader/README.md → ...astructure/controllers/reloader/README.md
diff --git a/...infrastructure/reloader/helm-release.yaml → ...re/controllers/reloader/helm-release.yaml b/...infrastructure/reloader/helm-release.yaml → ...re/controllers/reloader/helm-release.yaml
diff --git a/...rastructure/reloader/helm-repository.yaml → ...controllers/reloader/helm-repository.yaml b/...rastructure/reloader/helm-repository.yaml → ...controllers/reloader/helm-repository.yaml
diff --git a/...nfrastructure/reloader/kustomization.yaml → ...e/controllers/reloader/kustomization.yaml b/...nfrastructure/reloader/kustomization.yaml → ...e/controllers/reloader/kustomization.yaml
diff --git a/...ed/infrastructure/reloader/namespace.yaml → ...cture/controllers/reloader/namespace.yaml b/...ed/infrastructure/reloader/namespace.yaml → ...cture/controllers/reloader/namespace.yaml
diff --git a/k8s/shared/infrastructure/testkube/README.md → ...astructure/controllers/testkube/README.md b/k8s/shared/infrastructure/testkube/README.md → ...astructure/controllers/testkube/README.md
diff --git a/.../crds/executor.testkube.io_executors.yaml → .../crds/executor.testkube.io_executors.yaml b/.../crds/executor.testkube.io_executors.yaml → .../crds/executor.testkube.io_executors.yaml
diff --git a/...e/crds/executor.testkube.io_webhooks.yaml → ...e/crds/executor.testkube.io_webhooks.yaml b/...e/crds/executor.testkube.io_webhooks.yaml → ...e/crds/executor.testkube.io_webhooks.yaml
diff --git a/...tructure/testkube/crds/kustomization.yaml → ...trollers/testkube/crds/kustomization.yaml b/...tructure/testkube/crds/kustomization.yaml → ...trollers/testkube/crds/kustomization.yaml
diff --git a/...tkube/crds/tests.testkube.io_scripts.yaml → ...tkube/crds/tests.testkube.io_scripts.yaml b/...tkube/crds/tests.testkube.io_scripts.yaml → ...tkube/crds/tests.testkube.io_scripts.yaml
diff --git a/...ube/crds/tests.testkube.io_templates.yaml → ...ube/crds/tests.testkube.io_templates.yaml b/...ube/crds/tests.testkube.io_templates.yaml → ...ube/crds/tests.testkube.io_templates.yaml
diff --git a/...rds/tests.testkube.io_testexecutions.yaml → ...rds/tests.testkube.io_testexecutions.yaml b/...rds/tests.testkube.io_testexecutions.yaml → ...rds/tests.testkube.io_testexecutions.yaml
diff --git a/...estkube/crds/tests.testkube.io_tests.yaml → ...estkube/crds/tests.testkube.io_tests.yaml b/...estkube/crds/tests.testkube.io_tests.yaml → ...estkube/crds/tests.testkube.io_tests.yaml
diff --git a/...e/crds/tests.testkube.io_testsources.yaml → ...e/crds/tests.testkube.io_testsources.yaml b/...e/crds/tests.testkube.io_testsources.yaml → ...e/crds/tests.testkube.io_testsources.yaml
diff --git a/...ests.testkube.io_testsuiteexecutions.yaml → ...ests.testkube.io_testsuiteexecutions.yaml b/...ests.testkube.io_testsuiteexecutions.yaml → ...ests.testkube.io_testsuiteexecutions.yaml
diff --git a/...be/crds/tests.testkube.io_testsuites.yaml → ...be/crds/tests.testkube.io_testsuites.yaml b/...be/crds/tests.testkube.io_testsuites.yaml → ...be/crds/tests.testkube.io_testsuites.yaml
diff --git a/.../crds/tests.testkube.io_testtriggers.yaml → .../crds/tests.testkube.io_testtriggers.yaml b/.../crds/tests.testkube.io_testtriggers.yaml → .../crds/tests.testkube.io_testtriggers.yaml
diff --git a/...s.testkube.io_testworkflowexecutions.yaml → ...s.testkube.io_testworkflowexecutions.yaml b/...s.testkube.io_testworkflowexecutions.yaml → ...s.testkube.io_testworkflowexecutions.yaml
diff --git a/...tworkflows.testkube.io_testworkflows.yaml → ...tworkflows.testkube.io_testworkflows.yaml b/...tworkflows.testkube.io_testworkflows.yaml → ...tworkflows.testkube.io_testworkflows.yaml
diff --git a/...ws.testkube.io_testworkflowtemplates.yaml → ...ws.testkube.io_testworkflowtemplates.yaml b/...ws.testkube.io_testworkflowtemplates.yaml → ...ws.testkube.io_testworkflowtemplates.yaml
diff --git a/...infrastructure/testkube/helm-release.yaml → ...re/controllers/testkube/helm-release.yaml b/...infrastructure/testkube/helm-release.yaml → ...re/controllers/testkube/helm-release.yaml
diff --git a/...rastructure/testkube/helm-repository.yaml → ...controllers/testkube/helm-repository.yaml b/...rastructure/testkube/helm-repository.yaml → ...controllers/testkube/helm-repository.yaml
diff --git a/...nfrastructure/testkube/kustomization.yaml → ...e/controllers/testkube/kustomization.yaml b/...nfrastructure/testkube/kustomization.yaml → ...e/controllers/testkube/kustomization.yaml
diff --git a/...ed/infrastructure/testkube/namespace.yaml → ...cture/controllers/testkube/namespace.yaml b/...ed/infrastructure/testkube/namespace.yaml → ...cture/controllers/testkube/namespace.yaml
diff --git a/k8s/shared/infrastructure/traefik/README.md → ...rastructure/controllers/traefik/README.md b/k8s/shared/infrastructure/traefik/README.md → ...rastructure/controllers/traefik/README.md
diff --git a/.../infrastructure/traefik/helm-release.yaml → ...ure/controllers/traefik/helm-release.yaml b/.../infrastructure/traefik/helm-release.yaml → ...ure/controllers/traefik/helm-release.yaml
diff --git a/...frastructure/traefik/helm-repository.yaml → .../controllers/traefik/helm-repository.yaml b/...frastructure/traefik/helm-repository.yaml → .../controllers/traefik/helm-repository.yaml
diff --git a/...infrastructure/traefik/kustomization.yaml → ...re/controllers/traefik/kustomization.yaml b/...infrastructure/traefik/kustomization.yaml → ...re/controllers/traefik/kustomization.yaml
diff --git a/...red/infrastructure/traefik/namespace.yaml → ...ucture/controllers/traefik/namespace.yaml b/...red/infrastructure/traefik/namespace.yaml → ...ucture/controllers/traefik/namespace.yaml
diff --git a/...d/infrastructure/trivy-operator/README.md → ...ture/controllers/trivy-operator/README.md b/...d/infrastructure/trivy-operator/README.md → ...ture/controllers/trivy-operator/README.md
diff --git a/...tructure/trivy-operator/helm-release.yaml → ...trollers/trivy-operator/helm-release.yaml b/...tructure/trivy-operator/helm-release.yaml → ...trollers/trivy-operator/helm-release.yaml
diff --git a/...cture/trivy-operator/helm-repository.yaml → ...llers/trivy-operator/helm-repository.yaml b/...cture/trivy-operator/helm-repository.yaml → ...llers/trivy-operator/helm-repository.yaml
diff --git a/...ructure/trivy-operator/kustomization.yaml → ...rollers/trivy-operator/kustomization.yaml b/...ructure/trivy-operator/kustomization.yaml → ...rollers/trivy-operator/kustomization.yaml
diff --git a/...rastructure/trivy-operator/namespace.yaml → ...controllers/trivy-operator/namespace.yaml b/...rastructure/trivy-operator/namespace.yaml → ...controllers/trivy-operator/namespace.yaml
diff --git a/k8s/shared/infrastructure/kustomization.yaml b/k8s/shared/infrastructure/kustomization.yaml
@@ -1,24 +1,12 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - capi-operator
-  - cert-manager
   - cloudflared
   - dex
-  - gha-runner-scale-set-controller
-  - goldilocks
   #- harbor
   - kube-prometheus-stack
-  - kyverno
-  - metrics-server
   - oauth2-proxy
   #- ollama
-  - reloader
-  #- testkube
-  - traefik
-  - trivy-operator
-  # - helm-charts-oci-proxy
-  # - k8sgpt-operator
 
 components:
   - ../../components/helm-release-crds-label