From 4815b133a9fda23d5029cd35b2fad3706d637724 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Thu, 24 Apr 2025 11:38:30 +0200 Subject: [PATCH] Restructured infra --- .../infra/kustomization.yaml | 20 +++++++++++++++++++ .../infra => infra/akri}/akri.yaml | 2 +- infra/akri/{ => akri}/helm-release.yaml | 0 infra/akri/{ => akri}/helm-repository.yaml | 0 infra/akri/akri/kustomization.yaml | 15 ++++++++++++++ infra/akri/{ => akri}/namespace.yaml | 0 infra/akri/{ => akri}/values.yaml | 0 infra/akri/kustomization.yaml | 13 +----------- .../authelia}/authelia-controller.yaml | 0 .../infra => infra/authelia}/authelia.yaml | 2 +- .../authelia/{ => authelia}/helm-release.yaml | 0 .../{ => authelia}/helm-repository.yaml | 0 infra/authelia/authelia/kustomization.yaml | 18 +++++++++++++++++ infra/authelia/{ => authelia}/namespace.yaml | 0 .../authelia/{ => authelia}/service-user.yaml | 0 infra/authelia/{ => authelia}/values.yaml | 0 infra/authelia/kustomization.yaml | 17 ++-------------- .../cert-manager}/cert-manager.yaml | 2 +- .../{ => cert-manager}/helm-release.yaml | 0 .../{ => cert-manager}/helm-repository.yaml | 0 .../cert-manager/kustomization.yaml | 15 ++++++++++++++ .../{ => cert-manager}/namespace.yaml | 0 .../{ => cert-manager}/values.yaml | 0 infra/cert-manager/kustomization.yaml | 14 ++----------- .../cert-manager}/letsencrypt.yaml | 2 +- .../letsencrypt/certificate-huizinga-dev.yaml | 0 .../certificate-staging-huizinga-dev.yaml | 0 .../letsencrypt/cluster-issuer.yaml | 0 .../letsencrypt/kustomization.yaml | 0 .../letsencrypt/namespace.yaml | 0 .../letsencrypt/secret-cloudflare-token.yaml | 0 .../infra => infra/cnpg}/cnpg.yaml | 2 +- infra/cnpg/{ => cnpg}/helm-release.yaml | 0 infra/cnpg/{ => cnpg}/helm-repository.yaml | 0 infra/cnpg/cnpg/kustomization.yaml | 14 +++++++++++++ infra/cnpg/{ => cnpg}/namespace.yaml | 0 infra/cnpg/{ => cnpg}/values.yaml | 0 infra/cnpg/kustomization.yaml | 12 +---------- .../infra => infra}/descheduler.yaml | 0 .../infra => infra}/dragonflydb.yaml | 0 .../infra => infra}/external-snapshotter.yaml | 0 .../infra => infra}/intel-device-plugins.yaml | 0 .../infra => infra/kube-vip}/kube-vip.yaml | 2 +- .../{ => kube-vip}/cluster-role-binding.yaml | 0 .../kube-vip/{ => kube-vip}/cluster-role.yaml | 0 .../{ => kube-vip}/config-map-kubevip.yaml | 0 infra/kube-vip/{ => kube-vip}/daemon-set.yaml | 0 infra/kube-vip/kube-vip/kustomization.yaml | 11 ++++++++++ .../{ => kube-vip}/service-account.yaml | 0 infra/kube-vip/kustomization.yaml | 9 +-------- infra/kyverno/kustomization.yaml | 14 ++----------- .../kyverno}/kyverno-policies.yaml | 2 +- .../kube-vip-network-adapter.yaml | 0 .../kyverno-policies/kustomization.yaml | 0 .../infra => infra/kyverno}/kyverno.yaml | 2 +- infra/kyverno/{ => kyverno}/helm-release.yaml | 0 .../{ => kyverno}/helm-repository.yaml | 0 infra/kyverno/kyverno/kustomization.yaml | 15 ++++++++++++++ infra/kyverno/{ => kyverno}/namespace.yaml | 0 infra/kyverno/{ => kyverno}/values.yaml | 0 infra/lldap/kustomization.yaml | 9 ++------- .../lldap}/lldap-controller.yaml | 0 .../infra => infra/lldap}/lldap.yaml | 2 +- infra/lldap/{ => lldap}/deployment.yaml | 0 infra/lldap/{ => lldap}/ingress-route.yaml | 0 infra/lldap/lldap/kustomization.yaml | 10 ++++++++++ infra/lldap/{ => lldap}/namespace.yaml | 0 .../{ => lldap}/secret-lldap-credentials.yaml | 0 infra/lldap/{ => lldap}/service.yaml | 0 .../node-feature-discovery/kustomization.yaml | 14 ++----------- .../node-feature-discovery-rules.yaml | 2 +- .../kustomization.yaml | 0 .../network-adapter.yaml | 0 .../node-feature-discovery.yaml | 2 +- .../helm-release.yaml | 0 .../helm-repository.yaml | 0 .../node-feature-discovery/kustomization.yaml | 15 ++++++++++++++ .../namespace.yaml | 0 .../{ => node-feature-discovery}/values.yaml | 0 infra/rook-ceph/kustomization.yaml | 6 ++---- .../rook-ceph}/rook-ceph-cluster.yaml | 2 +- .../access-control-rule.yaml | 0 .../rook-ceph-cluster/helm-release.yaml | 0 .../rook-ceph-cluster/kustomization.yaml | 2 +- .../rook-ceph-cluster/values.yaml | 0 .../infra => infra/rook-ceph}/rook-ceph.yaml | 2 +- .../{ => rook-ceph}/helm-release.yaml | 0 .../{ => rook-ceph}/helm-repository.yaml | 0 infra/rook-ceph/rook-ceph/kustomization.yaml | 7 +++++++ .../rook-ceph/{ => rook-ceph}/namespace.yaml | 0 infra/topolvm/kustomization.yaml | 14 +------------ .../infra => infra/topolvm}/topolvm.yaml | 2 +- infra/topolvm/{ => topolvm}/helm-release.yaml | 0 .../{ => topolvm}/helm-repository.yaml | 0 infra/topolvm/topolvm/kustomization.yaml | 16 +++++++++++++++ infra/topolvm/{ => topolvm}/namespace.yaml | 0 infra/topolvm/{ => topolvm}/values.yaml | 0 .../{ => topolvm}/volume-snapshot-class.yaml | 0 infra/traefik/kustomization.yaml | 15 ++------------ .../traefik}/traefik-middleware.yaml | 2 +- .../traefik-middleware/default-headers.yaml | 0 .../traefik-middleware/kustomization.yaml | 0 .../infra => infra/traefik}/traefik.yaml | 2 +- .../{ => traefik}/access-control-rule.yaml | 0 infra/traefik/{ => traefik}/helm-release.yaml | 0 .../{ => traefik}/helm-repository.yaml | 0 infra/traefik/traefik/kustomization.yaml | 16 +++++++++++++++ infra/traefik/{ => traefik}/namespace.yaml | 0 infra/traefik/{ => traefik}/values.yaml | 0 infra/velero/kustomization.yaml | 15 +------------- .../infra => infra/velero}/velero.yaml | 2 +- infra/velero/{ => velero}/helm-release.yaml | 0 .../velero/{ => velero}/helm-repository.yaml | 0 infra/velero/velero/kustomization.yaml | 17 ++++++++++++++++ infra/velero/{ => velero}/namespace.yaml | 0 .../{ => velero}/secret-s3-credentials.yaml | 0 .../secret-velero-repo-credentials.yaml | 0 infra/velero/{ => velero}/values.yaml | 0 118 files changed, 226 insertions(+), 151 deletions(-) create mode 100644 clusters/titan.lan.huizinga.dev/infra/kustomization.yaml rename {clusters/titan.lan.huizinga.dev/infra => infra/akri}/akri.yaml (91%) rename infra/akri/{ => akri}/helm-release.yaml (100%) rename infra/akri/{ => akri}/helm-repository.yaml (100%) create mode 100644 infra/akri/akri/kustomization.yaml rename infra/akri/{ => akri}/namespace.yaml (100%) rename infra/akri/{ => akri}/values.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/authelia}/authelia-controller.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/authelia}/authelia.yaml (94%) rename infra/authelia/{ => authelia}/helm-release.yaml (100%) rename infra/authelia/{ => authelia}/helm-repository.yaml (100%) create mode 100644 infra/authelia/authelia/kustomization.yaml rename infra/authelia/{ => authelia}/namespace.yaml (100%) rename infra/authelia/{ => authelia}/service-user.yaml (100%) rename infra/authelia/{ => authelia}/values.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/cert-manager}/cert-manager.yaml (86%) rename infra/cert-manager/{ => cert-manager}/helm-release.yaml (100%) rename infra/cert-manager/{ => cert-manager}/helm-repository.yaml (100%) create mode 100644 infra/cert-manager/cert-manager/kustomization.yaml rename infra/cert-manager/{ => cert-manager}/namespace.yaml (100%) rename infra/cert-manager/{ => cert-manager}/values.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/cert-manager}/letsencrypt.yaml (90%) rename infra/{ => cert-manager}/letsencrypt/certificate-huizinga-dev.yaml (100%) rename infra/{ => cert-manager}/letsencrypt/certificate-staging-huizinga-dev.yaml (100%) rename infra/{ => cert-manager}/letsencrypt/cluster-issuer.yaml (100%) rename infra/{ => cert-manager}/letsencrypt/kustomization.yaml (100%) rename infra/{ => cert-manager}/letsencrypt/namespace.yaml (100%) rename infra/{ => cert-manager}/letsencrypt/secret-cloudflare-token.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/cnpg}/cnpg.yaml (91%) rename infra/cnpg/{ => cnpg}/helm-release.yaml (100%) rename infra/cnpg/{ => cnpg}/helm-repository.yaml (100%) create mode 100644 infra/cnpg/cnpg/kustomization.yaml rename infra/cnpg/{ => cnpg}/namespace.yaml (100%) rename infra/cnpg/{ => cnpg}/values.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra}/descheduler.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra}/dragonflydb.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra}/external-snapshotter.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra}/intel-device-plugins.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/kube-vip}/kube-vip.yaml (90%) rename infra/kube-vip/{ => kube-vip}/cluster-role-binding.yaml (100%) rename infra/kube-vip/{ => kube-vip}/cluster-role.yaml (100%) rename infra/kube-vip/{ => kube-vip}/config-map-kubevip.yaml (100%) rename infra/kube-vip/{ => kube-vip}/daemon-set.yaml (100%) create mode 100644 infra/kube-vip/kube-vip/kustomization.yaml rename infra/kube-vip/{ => kube-vip}/service-account.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/kyverno}/kyverno-policies.yaml (88%) rename infra/{ => kyverno}/kyverno-policies/kube-vip-network-adapter.yaml (100%) rename infra/{ => kyverno}/kyverno-policies/kustomization.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/kyverno}/kyverno.yaml (89%) rename infra/kyverno/{ => kyverno}/helm-release.yaml (100%) rename infra/kyverno/{ => kyverno}/helm-repository.yaml (100%) create mode 100644 infra/kyverno/kyverno/kustomization.yaml rename infra/kyverno/{ => kyverno}/namespace.yaml (100%) rename infra/kyverno/{ => kyverno}/values.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/lldap}/lldap-controller.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/lldap}/lldap.yaml (94%) rename infra/lldap/{ => lldap}/deployment.yaml (100%) rename infra/lldap/{ => lldap}/ingress-route.yaml (100%) create mode 100644 infra/lldap/lldap/kustomization.yaml rename infra/lldap/{ => lldap}/namespace.yaml (100%) rename infra/lldap/{ => lldap}/secret-lldap-credentials.yaml (100%) rename infra/lldap/{ => lldap}/service.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/node-feature-discovery}/node-feature-discovery-rules.yaml (80%) rename infra/{ => node-feature-discovery}/node-feature-discovery-rules/kustomization.yaml (100%) rename infra/{ => node-feature-discovery}/node-feature-discovery-rules/network-adapter.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/node-feature-discovery}/node-feature-discovery.yaml (82%) rename infra/node-feature-discovery/{ => node-feature-discovery}/helm-release.yaml (100%) rename infra/node-feature-discovery/{ => node-feature-discovery}/helm-repository.yaml (100%) create mode 100644 infra/node-feature-discovery/node-feature-discovery/kustomization.yaml rename infra/node-feature-discovery/{ => node-feature-discovery}/namespace.yaml (100%) rename infra/node-feature-discovery/{ => node-feature-discovery}/values.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/rook-ceph}/rook-ceph-cluster.yaml (90%) rename infra/{ => rook-ceph}/rook-ceph-cluster/access-control-rule.yaml (100%) rename infra/{ => rook-ceph}/rook-ceph-cluster/helm-release.yaml (100%) rename infra/{ => rook-ceph}/rook-ceph-cluster/kustomization.yaml (82%) rename infra/{ => rook-ceph}/rook-ceph-cluster/values.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/rook-ceph}/rook-ceph.yaml (88%) rename infra/rook-ceph/{ => rook-ceph}/helm-release.yaml (100%) rename infra/rook-ceph/{ => rook-ceph}/helm-repository.yaml (100%) create mode 100644 infra/rook-ceph/rook-ceph/kustomization.yaml rename infra/rook-ceph/{ => rook-ceph}/namespace.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/topolvm}/topolvm.yaml (90%) rename infra/topolvm/{ => topolvm}/helm-release.yaml (100%) rename infra/topolvm/{ => topolvm}/helm-repository.yaml (100%) create mode 100644 infra/topolvm/topolvm/kustomization.yaml rename infra/topolvm/{ => topolvm}/namespace.yaml (100%) rename infra/topolvm/{ => topolvm}/values.yaml (100%) rename infra/topolvm/{ => topolvm}/volume-snapshot-class.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/traefik}/traefik-middleware.yaml (87%) rename infra/{ => traefik}/traefik-middleware/default-headers.yaml (100%) rename infra/{ => traefik}/traefik-middleware/kustomization.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/traefik}/traefik.yaml (92%) rename infra/traefik/{ => traefik}/access-control-rule.yaml (100%) rename infra/traefik/{ => traefik}/helm-release.yaml (100%) rename infra/traefik/{ => traefik}/helm-repository.yaml (100%) create mode 100644 infra/traefik/traefik/kustomization.yaml rename infra/traefik/{ => traefik}/namespace.yaml (100%) rename infra/traefik/{ => traefik}/values.yaml (100%) rename {clusters/titan.lan.huizinga.dev/infra => infra/velero}/velero.yaml (92%) rename infra/velero/{ => velero}/helm-release.yaml (100%) rename infra/velero/{ => velero}/helm-repository.yaml (100%) create mode 100644 infra/velero/velero/kustomization.yaml rename infra/velero/{ => velero}/namespace.yaml (100%) rename infra/velero/{ => velero}/secret-s3-credentials.yaml (100%) rename infra/velero/{ => velero}/secret-velero-repo-credentials.yaml (100%) rename infra/velero/{ => velero}/values.yaml (100%) diff --git a/clusters/titan.lan.huizinga.dev/infra/kustomization.yaml b/clusters/titan.lan.huizinga.dev/infra/kustomization.yaml new file mode 100644 index 0000000..ef2b454 --- /dev/null +++ b/clusters/titan.lan.huizinga.dev/infra/kustomization.yaml @@ -0,0 +1,20 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ./../../../infra/akri + - ./../../../infra/authelia + - ./../../../infra/cert-manager + - ./../../../infra/cnpg + - ./../../../infra/descheduler.yaml + - ./../../../infra/dragonflydb.yaml + - ./../../../infra/external-snapshotter.yaml + - ./../../../infra/intel-device-plugins.yaml + - ./../../../infra/kube-vip + - ./../../../infra/kyverno + - ./../../../infra/lldap + - ./../../../infra/node-feature-discovery + - ./../../../infra/rook-ceph + - ./../../../infra/topolvm/ + - ./../../../infra/traefik/ + - ./../../../infra/velero/ diff --git a/clusters/titan.lan.huizinga.dev/infra/akri.yaml b/infra/akri/akri.yaml similarity index 91% rename from clusters/titan.lan.huizinga.dev/infra/akri.yaml rename to infra/akri/akri.yaml index aea3fd6..4942186 100644 --- a/clusters/titan.lan.huizinga.dev/infra/akri.yaml +++ b/infra/akri/akri.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/akri + path: ./infra/akri/akri prune: true timeout: 2m sourceRef: diff --git a/infra/akri/helm-release.yaml b/infra/akri/akri/helm-release.yaml similarity index 100% rename from infra/akri/helm-release.yaml rename to infra/akri/akri/helm-release.yaml diff --git a/infra/akri/helm-repository.yaml b/infra/akri/akri/helm-repository.yaml similarity index 100% rename from infra/akri/helm-repository.yaml rename to infra/akri/akri/helm-repository.yaml diff --git a/infra/akri/akri/kustomization.yaml b/infra/akri/akri/kustomization.yaml new file mode 100644 index 0000000..519c76f --- /dev/null +++ b/infra/akri/akri/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: akri +resources: + - ./namespace.yaml + - ./helm-repository.yaml + - ./helm-release.yaml + +configurations: + - ../../../common/name-reference/helm-release.yaml + +configMapGenerator: + - name: akri-values + files: + - ./values.yaml diff --git a/infra/akri/namespace.yaml b/infra/akri/akri/namespace.yaml similarity index 100% rename from infra/akri/namespace.yaml rename to infra/akri/akri/namespace.yaml diff --git a/infra/akri/values.yaml b/infra/akri/akri/values.yaml similarity index 100% rename from infra/akri/values.yaml rename to infra/akri/akri/values.yaml diff --git a/infra/akri/kustomization.yaml b/infra/akri/kustomization.yaml index 80beb4e..71bb558 100644 --- a/infra/akri/kustomization.yaml +++ b/infra/akri/kustomization.yaml @@ -1,15 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: akri resources: - - ./namespace.yaml - - ./helm-repository.yaml - - ./helm-release.yaml - -configurations: - - ../../common/name-reference/helm-release.yaml - -configMapGenerator: - - name: akri-values - files: - - ./values.yaml + - ./akri.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/authelia-controller.yaml b/infra/authelia/authelia-controller.yaml similarity index 100% rename from clusters/titan.lan.huizinga.dev/infra/authelia-controller.yaml rename to infra/authelia/authelia-controller.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/authelia.yaml b/infra/authelia/authelia.yaml similarity index 94% rename from clusters/titan.lan.huizinga.dev/infra/authelia.yaml rename to infra/authelia/authelia.yaml index 5348c64..6ad0aae 100644 --- a/clusters/titan.lan.huizinga.dev/infra/authelia.yaml +++ b/infra/authelia/authelia.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/authelia + path: ./infra/authelia/authelia dependsOn: - name: traefik - name: cnpg diff --git a/infra/authelia/helm-release.yaml b/infra/authelia/authelia/helm-release.yaml similarity index 100% rename from infra/authelia/helm-release.yaml rename to infra/authelia/authelia/helm-release.yaml diff --git a/infra/authelia/helm-repository.yaml b/infra/authelia/authelia/helm-repository.yaml similarity index 100% rename from infra/authelia/helm-repository.yaml rename to infra/authelia/authelia/helm-repository.yaml diff --git a/infra/authelia/authelia/kustomization.yaml b/infra/authelia/authelia/kustomization.yaml new file mode 100644 index 0000000..f0c1532 --- /dev/null +++ b/infra/authelia/authelia/kustomization.yaml @@ -0,0 +1,18 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: authelia +resources: + - ./namespace.yaml + - ./helm-repository.yaml + - ./helm-release.yaml + - ./service-user.yaml + - ../../../common/postgres + - ../../../common/dragonflydb + +configurations: + - ../../../common/name-reference/helm-release.yaml + +configMapGenerator: + - name: authelia-values + files: + - ./values.yaml diff --git a/infra/authelia/namespace.yaml b/infra/authelia/authelia/namespace.yaml similarity index 100% rename from infra/authelia/namespace.yaml rename to infra/authelia/authelia/namespace.yaml diff --git a/infra/authelia/service-user.yaml b/infra/authelia/authelia/service-user.yaml similarity index 100% rename from infra/authelia/service-user.yaml rename to infra/authelia/authelia/service-user.yaml diff --git a/infra/authelia/values.yaml b/infra/authelia/authelia/values.yaml similarity index 100% rename from infra/authelia/values.yaml rename to infra/authelia/authelia/values.yaml diff --git a/infra/authelia/kustomization.yaml b/infra/authelia/kustomization.yaml index 125afe6..5892844 100644 --- a/infra/authelia/kustomization.yaml +++ b/infra/authelia/kustomization.yaml @@ -1,18 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: authelia resources: - - ./namespace.yaml - - ./helm-repository.yaml - - ./helm-release.yaml - - ./service-user.yaml - - ../../common/postgres - - ../../common/dragonflydb - -configurations: - - ../../common/name-reference/helm-release.yaml - -configMapGenerator: - - name: authelia-values - files: - - ./values.yaml + - ./authelia-controller.yaml + - ./authelia.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/cert-manager.yaml b/infra/cert-manager/cert-manager.yaml similarity index 86% rename from clusters/titan.lan.huizinga.dev/infra/cert-manager.yaml rename to infra/cert-manager/cert-manager.yaml index 29ee202..5714aff 100644 --- a/clusters/titan.lan.huizinga.dev/infra/cert-manager.yaml +++ b/infra/cert-manager/cert-manager.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/cert-manager + path: ./infra/cert-manager/cert-manager prune: true timeout: 2m sourceRef: diff --git a/infra/cert-manager/helm-release.yaml b/infra/cert-manager/cert-manager/helm-release.yaml similarity index 100% rename from infra/cert-manager/helm-release.yaml rename to infra/cert-manager/cert-manager/helm-release.yaml diff --git a/infra/cert-manager/helm-repository.yaml b/infra/cert-manager/cert-manager/helm-repository.yaml similarity index 100% rename from infra/cert-manager/helm-repository.yaml rename to infra/cert-manager/cert-manager/helm-repository.yaml diff --git a/infra/cert-manager/cert-manager/kustomization.yaml b/infra/cert-manager/cert-manager/kustomization.yaml new file mode 100644 index 0000000..482bca1 --- /dev/null +++ b/infra/cert-manager/cert-manager/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: cert-manager +resources: + - ./namespace.yaml + - ./helm-repository.yaml + - ./helm-release.yaml + +configurations: + - ../../../common/name-reference/helm-release.yaml + +configMapGenerator: + - name: cert-manager-values + files: + - ./values.yaml diff --git a/infra/cert-manager/namespace.yaml b/infra/cert-manager/cert-manager/namespace.yaml similarity index 100% rename from infra/cert-manager/namespace.yaml rename to infra/cert-manager/cert-manager/namespace.yaml diff --git a/infra/cert-manager/values.yaml b/infra/cert-manager/cert-manager/values.yaml similarity index 100% rename from infra/cert-manager/values.yaml rename to infra/cert-manager/cert-manager/values.yaml diff --git a/infra/cert-manager/kustomization.yaml b/infra/cert-manager/kustomization.yaml index 68d1b3e..a13e771 100644 --- a/infra/cert-manager/kustomization.yaml +++ b/infra/cert-manager/kustomization.yaml @@ -1,15 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: cert-manager resources: - - ./namespace.yaml - - ./helm-repository.yaml - - ./helm-release.yaml - -configurations: - - ../../common/name-reference/helm-release.yaml - -configMapGenerator: - - name: cert-manager-values - files: - - ./values.yaml + - ./cert-manager.yaml + - ./letsencrypt.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/letsencrypt.yaml b/infra/cert-manager/letsencrypt.yaml similarity index 90% rename from clusters/titan.lan.huizinga.dev/infra/letsencrypt.yaml rename to infra/cert-manager/letsencrypt.yaml index fa1ecda..da6e298 100644 --- a/clusters/titan.lan.huizinga.dev/infra/letsencrypt.yaml +++ b/infra/cert-manager/letsencrypt.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/letsencrypt + path: ./infra/cert-manager/letsencrypt dependsOn: - name: cert-manager prune: true diff --git a/infra/letsencrypt/certificate-huizinga-dev.yaml b/infra/cert-manager/letsencrypt/certificate-huizinga-dev.yaml similarity index 100% rename from infra/letsencrypt/certificate-huizinga-dev.yaml rename to infra/cert-manager/letsencrypt/certificate-huizinga-dev.yaml diff --git a/infra/letsencrypt/certificate-staging-huizinga-dev.yaml b/infra/cert-manager/letsencrypt/certificate-staging-huizinga-dev.yaml similarity index 100% rename from infra/letsencrypt/certificate-staging-huizinga-dev.yaml rename to infra/cert-manager/letsencrypt/certificate-staging-huizinga-dev.yaml diff --git a/infra/letsencrypt/cluster-issuer.yaml b/infra/cert-manager/letsencrypt/cluster-issuer.yaml similarity index 100% rename from infra/letsencrypt/cluster-issuer.yaml rename to infra/cert-manager/letsencrypt/cluster-issuer.yaml diff --git a/infra/letsencrypt/kustomization.yaml b/infra/cert-manager/letsencrypt/kustomization.yaml similarity index 100% rename from infra/letsencrypt/kustomization.yaml rename to infra/cert-manager/letsencrypt/kustomization.yaml diff --git a/infra/letsencrypt/namespace.yaml b/infra/cert-manager/letsencrypt/namespace.yaml similarity index 100% rename from infra/letsencrypt/namespace.yaml rename to infra/cert-manager/letsencrypt/namespace.yaml diff --git a/infra/letsencrypt/secret-cloudflare-token.yaml b/infra/cert-manager/letsencrypt/secret-cloudflare-token.yaml similarity index 100% rename from infra/letsencrypt/secret-cloudflare-token.yaml rename to infra/cert-manager/letsencrypt/secret-cloudflare-token.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/cnpg.yaml b/infra/cnpg/cnpg.yaml similarity index 91% rename from clusters/titan.lan.huizinga.dev/infra/cnpg.yaml rename to infra/cnpg/cnpg.yaml index ea68fb7..3c78393 100644 --- a/clusters/titan.lan.huizinga.dev/infra/cnpg.yaml +++ b/infra/cnpg/cnpg.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/cnpg + path: ./infra/cnpg/cnpg dependsOn: - name: topolvm prune: true diff --git a/infra/cnpg/helm-release.yaml b/infra/cnpg/cnpg/helm-release.yaml similarity index 100% rename from infra/cnpg/helm-release.yaml rename to infra/cnpg/cnpg/helm-release.yaml diff --git a/infra/cnpg/helm-repository.yaml b/infra/cnpg/cnpg/helm-repository.yaml similarity index 100% rename from infra/cnpg/helm-repository.yaml rename to infra/cnpg/cnpg/helm-repository.yaml diff --git a/infra/cnpg/cnpg/kustomization.yaml b/infra/cnpg/cnpg/kustomization.yaml new file mode 100644 index 0000000..b0cfbc6 --- /dev/null +++ b/infra/cnpg/cnpg/kustomization.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: cnpg-system +resources: + - ./namespace.yaml + - ./helm-repository.yaml + - ./helm-release.yaml +configurations: + - ../../../common/name-reference/helm-release.yaml + +configMapGenerator: + - name: cnpg-values + files: + - ./values.yaml diff --git a/infra/cnpg/namespace.yaml b/infra/cnpg/cnpg/namespace.yaml similarity index 100% rename from infra/cnpg/namespace.yaml rename to infra/cnpg/cnpg/namespace.yaml diff --git a/infra/cnpg/values.yaml b/infra/cnpg/cnpg/values.yaml similarity index 100% rename from infra/cnpg/values.yaml rename to infra/cnpg/cnpg/values.yaml diff --git a/infra/cnpg/kustomization.yaml b/infra/cnpg/kustomization.yaml index a6db626..b067768 100644 --- a/infra/cnpg/kustomization.yaml +++ b/infra/cnpg/kustomization.yaml @@ -1,14 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: cnpg-system resources: - - ./namespace.yaml - - ./helm-repository.yaml - - ./helm-release.yaml -configurations: - - ../../common/name-reference/helm-release.yaml - -configMapGenerator: - - name: cnpg-values - files: - - ./values.yaml + - ./cnpg.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/descheduler.yaml b/infra/descheduler.yaml similarity index 100% rename from clusters/titan.lan.huizinga.dev/infra/descheduler.yaml rename to infra/descheduler.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/dragonflydb.yaml b/infra/dragonflydb.yaml similarity index 100% rename from clusters/titan.lan.huizinga.dev/infra/dragonflydb.yaml rename to infra/dragonflydb.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/external-snapshotter.yaml b/infra/external-snapshotter.yaml similarity index 100% rename from clusters/titan.lan.huizinga.dev/infra/external-snapshotter.yaml rename to infra/external-snapshotter.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/intel-device-plugins.yaml b/infra/intel-device-plugins.yaml similarity index 100% rename from clusters/titan.lan.huizinga.dev/infra/intel-device-plugins.yaml rename to infra/intel-device-plugins.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/kube-vip.yaml b/infra/kube-vip/kube-vip.yaml similarity index 90% rename from clusters/titan.lan.huizinga.dev/infra/kube-vip.yaml rename to infra/kube-vip/kube-vip.yaml index 15a3485..36610c3 100644 --- a/clusters/titan.lan.huizinga.dev/infra/kube-vip.yaml +++ b/infra/kube-vip/kube-vip.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/kube-vip + path: ./infra/kube-vip/kube-vip dependsOn: - name: kyverno-policies prune: true diff --git a/infra/kube-vip/cluster-role-binding.yaml b/infra/kube-vip/kube-vip/cluster-role-binding.yaml similarity index 100% rename from infra/kube-vip/cluster-role-binding.yaml rename to infra/kube-vip/kube-vip/cluster-role-binding.yaml diff --git a/infra/kube-vip/cluster-role.yaml b/infra/kube-vip/kube-vip/cluster-role.yaml similarity index 100% rename from infra/kube-vip/cluster-role.yaml rename to infra/kube-vip/kube-vip/cluster-role.yaml diff --git a/infra/kube-vip/config-map-kubevip.yaml b/infra/kube-vip/kube-vip/config-map-kubevip.yaml similarity index 100% rename from infra/kube-vip/config-map-kubevip.yaml rename to infra/kube-vip/kube-vip/config-map-kubevip.yaml diff --git a/infra/kube-vip/daemon-set.yaml b/infra/kube-vip/kube-vip/daemon-set.yaml similarity index 100% rename from infra/kube-vip/daemon-set.yaml rename to infra/kube-vip/kube-vip/daemon-set.yaml diff --git a/infra/kube-vip/kube-vip/kustomization.yaml b/infra/kube-vip/kube-vip/kustomization.yaml new file mode 100644 index 0000000..eee15f5 --- /dev/null +++ b/infra/kube-vip/kube-vip/kustomization.yaml @@ -0,0 +1,11 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - ./service-account.yaml + - ./cluster-role.yaml + - ./cluster-role-binding.yaml + - ./daemon-set.yaml + + - https://raw.githubusercontent.com/kube-vip/kube-vip-cloud-provider/refs/tags/v0.0.11/manifest/kube-vip-cloud-controller.yaml + - ./config-map-kubevip.yaml diff --git a/infra/kube-vip/service-account.yaml b/infra/kube-vip/kube-vip/service-account.yaml similarity index 100% rename from infra/kube-vip/service-account.yaml rename to infra/kube-vip/kube-vip/service-account.yaml diff --git a/infra/kube-vip/kustomization.yaml b/infra/kube-vip/kustomization.yaml index eee15f5..e44310d 100644 --- a/infra/kube-vip/kustomization.yaml +++ b/infra/kube-vip/kustomization.yaml @@ -1,11 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kube-system resources: - - ./service-account.yaml - - ./cluster-role.yaml - - ./cluster-role-binding.yaml - - ./daemon-set.yaml - - - https://raw.githubusercontent.com/kube-vip/kube-vip-cloud-provider/refs/tags/v0.0.11/manifest/kube-vip-cloud-controller.yaml - - ./config-map-kubevip.yaml + - ./kube-vip.yaml diff --git a/infra/kyverno/kustomization.yaml b/infra/kyverno/kustomization.yaml index a3e632e..c9d883f 100644 --- a/infra/kyverno/kustomization.yaml +++ b/infra/kyverno/kustomization.yaml @@ -1,15 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kyverno resources: - - ./namespace.yaml - - ./helm-repository.yaml - - ./helm-release.yaml - -configurations: - - ../../common/name-reference/helm-release.yaml - -configMapGenerator: - - name: kyverno-values - files: - - ./values.yaml + - ./kyverno-policies.yaml + - ./kyverno.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/kyverno-policies.yaml b/infra/kyverno/kyverno-policies.yaml similarity index 88% rename from clusters/titan.lan.huizinga.dev/infra/kyverno-policies.yaml rename to infra/kyverno/kyverno-policies.yaml index 12a3179..2e0070d 100644 --- a/clusters/titan.lan.huizinga.dev/infra/kyverno-policies.yaml +++ b/infra/kyverno/kyverno-policies.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/kyverno-policies + path: ./infra/kyverno/kyverno-policies dependsOn: - name: kyverno prune: true diff --git a/infra/kyverno-policies/kube-vip-network-adapter.yaml b/infra/kyverno/kyverno-policies/kube-vip-network-adapter.yaml similarity index 100% rename from infra/kyverno-policies/kube-vip-network-adapter.yaml rename to infra/kyverno/kyverno-policies/kube-vip-network-adapter.yaml diff --git a/infra/kyverno-policies/kustomization.yaml b/infra/kyverno/kyverno-policies/kustomization.yaml similarity index 100% rename from infra/kyverno-policies/kustomization.yaml rename to infra/kyverno/kyverno-policies/kustomization.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/kyverno.yaml b/infra/kyverno/kyverno.yaml similarity index 89% rename from clusters/titan.lan.huizinga.dev/infra/kyverno.yaml rename to infra/kyverno/kyverno.yaml index fd2bd98..5cb1685 100644 --- a/clusters/titan.lan.huizinga.dev/infra/kyverno.yaml +++ b/infra/kyverno/kyverno.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/kyverno + path: ./infra/kyverno/kyverno prune: true timeout: 2m sourceRef: diff --git a/infra/kyverno/helm-release.yaml b/infra/kyverno/kyverno/helm-release.yaml similarity index 100% rename from infra/kyverno/helm-release.yaml rename to infra/kyverno/kyverno/helm-release.yaml diff --git a/infra/kyverno/helm-repository.yaml b/infra/kyverno/kyverno/helm-repository.yaml similarity index 100% rename from infra/kyverno/helm-repository.yaml rename to infra/kyverno/kyverno/helm-repository.yaml diff --git a/infra/kyverno/kyverno/kustomization.yaml b/infra/kyverno/kyverno/kustomization.yaml new file mode 100644 index 0000000..aa4c03c --- /dev/null +++ b/infra/kyverno/kyverno/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kyverno +resources: + - ./namespace.yaml + - ./helm-repository.yaml + - ./helm-release.yaml + +configurations: + - ../../../common/name-reference/helm-release.yaml + +configMapGenerator: + - name: kyverno-values + files: + - ./values.yaml diff --git a/infra/kyverno/namespace.yaml b/infra/kyverno/kyverno/namespace.yaml similarity index 100% rename from infra/kyverno/namespace.yaml rename to infra/kyverno/kyverno/namespace.yaml diff --git a/infra/kyverno/values.yaml b/infra/kyverno/kyverno/values.yaml similarity index 100% rename from infra/kyverno/values.yaml rename to infra/kyverno/kyverno/values.yaml diff --git a/infra/lldap/kustomization.yaml b/infra/lldap/kustomization.yaml index b4d470f..409c256 100644 --- a/infra/lldap/kustomization.yaml +++ b/infra/lldap/kustomization.yaml @@ -1,10 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: lldap resources: - - ./namespace.yaml - - ./secret-lldap-credentials.yaml - - ./deployment.yaml - - ./service.yaml - - ./ingress-route.yaml - - ../../common/postgres + - ./lldap-controller.yaml + - ./lldap.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/lldap-controller.yaml b/infra/lldap/lldap-controller.yaml similarity index 100% rename from clusters/titan.lan.huizinga.dev/infra/lldap-controller.yaml rename to infra/lldap/lldap-controller.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/lldap.yaml b/infra/lldap/lldap.yaml similarity index 94% rename from clusters/titan.lan.huizinga.dev/infra/lldap.yaml rename to infra/lldap/lldap.yaml index e02b09a..0cc755a 100644 --- a/clusters/titan.lan.huizinga.dev/infra/lldap.yaml +++ b/infra/lldap/lldap.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/lldap + path: ./infra/lldap/lldap dependsOn: - name: traefik - name: cnpg diff --git a/infra/lldap/deployment.yaml b/infra/lldap/lldap/deployment.yaml similarity index 100% rename from infra/lldap/deployment.yaml rename to infra/lldap/lldap/deployment.yaml diff --git a/infra/lldap/ingress-route.yaml b/infra/lldap/lldap/ingress-route.yaml similarity index 100% rename from infra/lldap/ingress-route.yaml rename to infra/lldap/lldap/ingress-route.yaml diff --git a/infra/lldap/lldap/kustomization.yaml b/infra/lldap/lldap/kustomization.yaml new file mode 100644 index 0000000..bfc4077 --- /dev/null +++ b/infra/lldap/lldap/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: lldap +resources: + - ./namespace.yaml + - ./secret-lldap-credentials.yaml + - ./deployment.yaml + - ./service.yaml + - ./ingress-route.yaml + - ../../../common/postgres diff --git a/infra/lldap/namespace.yaml b/infra/lldap/lldap/namespace.yaml similarity index 100% rename from infra/lldap/namespace.yaml rename to infra/lldap/lldap/namespace.yaml diff --git a/infra/lldap/secret-lldap-credentials.yaml b/infra/lldap/lldap/secret-lldap-credentials.yaml similarity index 100% rename from infra/lldap/secret-lldap-credentials.yaml rename to infra/lldap/lldap/secret-lldap-credentials.yaml diff --git a/infra/lldap/service.yaml b/infra/lldap/lldap/service.yaml similarity index 100% rename from infra/lldap/service.yaml rename to infra/lldap/lldap/service.yaml diff --git a/infra/node-feature-discovery/kustomization.yaml b/infra/node-feature-discovery/kustomization.yaml index 98f6018..69a1d6d 100644 --- a/infra/node-feature-discovery/kustomization.yaml +++ b/infra/node-feature-discovery/kustomization.yaml @@ -1,15 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: node-feature-discovery resources: - - ./namespace.yaml - - ./helm-repository.yaml - - ./helm-release.yaml - -configurations: - - ../../common/name-reference/helm-release.yaml - -configMapGenerator: - - name: nfd-values - files: - - ./values.yaml + - ./node-feature-discovery-rules.yaml + - ./node-feature-discovery.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/node-feature-discovery-rules.yaml b/infra/node-feature-discovery/node-feature-discovery-rules.yaml similarity index 80% rename from clusters/titan.lan.huizinga.dev/infra/node-feature-discovery-rules.yaml rename to infra/node-feature-discovery/node-feature-discovery-rules.yaml index 37f3d8a..d55e266 100644 --- a/clusters/titan.lan.huizinga.dev/infra/node-feature-discovery-rules.yaml +++ b/infra/node-feature-discovery/node-feature-discovery-rules.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/node-feature-discovery-rules + path: ./infra/node-feature-discovery/node-feature-discovery-rules prune: true timeout: 2m sourceRef: diff --git a/infra/node-feature-discovery-rules/kustomization.yaml b/infra/node-feature-discovery/node-feature-discovery-rules/kustomization.yaml similarity index 100% rename from infra/node-feature-discovery-rules/kustomization.yaml rename to infra/node-feature-discovery/node-feature-discovery-rules/kustomization.yaml diff --git a/infra/node-feature-discovery-rules/network-adapter.yaml b/infra/node-feature-discovery/node-feature-discovery-rules/network-adapter.yaml similarity index 100% rename from infra/node-feature-discovery-rules/network-adapter.yaml rename to infra/node-feature-discovery/node-feature-discovery-rules/network-adapter.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/node-feature-discovery.yaml b/infra/node-feature-discovery/node-feature-discovery.yaml similarity index 82% rename from clusters/titan.lan.huizinga.dev/infra/node-feature-discovery.yaml rename to infra/node-feature-discovery/node-feature-discovery.yaml index 505344f..9509ca8 100644 --- a/clusters/titan.lan.huizinga.dev/infra/node-feature-discovery.yaml +++ b/infra/node-feature-discovery/node-feature-discovery.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/node-feature-discovery + path: ./infra/node-feature-discovery/node-feature-discovery prune: true timeout: 2m sourceRef: diff --git a/infra/node-feature-discovery/helm-release.yaml b/infra/node-feature-discovery/node-feature-discovery/helm-release.yaml similarity index 100% rename from infra/node-feature-discovery/helm-release.yaml rename to infra/node-feature-discovery/node-feature-discovery/helm-release.yaml diff --git a/infra/node-feature-discovery/helm-repository.yaml b/infra/node-feature-discovery/node-feature-discovery/helm-repository.yaml similarity index 100% rename from infra/node-feature-discovery/helm-repository.yaml rename to infra/node-feature-discovery/node-feature-discovery/helm-repository.yaml diff --git a/infra/node-feature-discovery/node-feature-discovery/kustomization.yaml b/infra/node-feature-discovery/node-feature-discovery/kustomization.yaml new file mode 100644 index 0000000..e4dd41b --- /dev/null +++ b/infra/node-feature-discovery/node-feature-discovery/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: node-feature-discovery +resources: + - ./namespace.yaml + - ./helm-repository.yaml + - ./helm-release.yaml + +configurations: + - ../../../common/name-reference/helm-release.yaml + +configMapGenerator: + - name: nfd-values + files: + - ./values.yaml diff --git a/infra/node-feature-discovery/namespace.yaml b/infra/node-feature-discovery/node-feature-discovery/namespace.yaml similarity index 100% rename from infra/node-feature-discovery/namespace.yaml rename to infra/node-feature-discovery/node-feature-discovery/namespace.yaml diff --git a/infra/node-feature-discovery/values.yaml b/infra/node-feature-discovery/node-feature-discovery/values.yaml similarity index 100% rename from infra/node-feature-discovery/values.yaml rename to infra/node-feature-discovery/node-feature-discovery/values.yaml diff --git a/infra/rook-ceph/kustomization.yaml b/infra/rook-ceph/kustomization.yaml index b6ce735..1ca5f06 100644 --- a/infra/rook-ceph/kustomization.yaml +++ b/infra/rook-ceph/kustomization.yaml @@ -1,7 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: rook-ceph resources: - - ./namespace.yaml - - ./helm-repository.yaml - - ./helm-release.yaml + - ./rook-ceph-cluster.yaml + - ./rook-ceph.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/rook-ceph-cluster.yaml b/infra/rook-ceph/rook-ceph-cluster.yaml similarity index 90% rename from clusters/titan.lan.huizinga.dev/infra/rook-ceph-cluster.yaml rename to infra/rook-ceph/rook-ceph-cluster.yaml index 4458b86..538c7c6 100644 --- a/clusters/titan.lan.huizinga.dev/infra/rook-ceph-cluster.yaml +++ b/infra/rook-ceph/rook-ceph-cluster.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/rook-ceph-cluster + path: ./infra/rook-ceph/rook-ceph-cluster dependsOn: - name: rook-ceph prune: true diff --git a/infra/rook-ceph-cluster/access-control-rule.yaml b/infra/rook-ceph/rook-ceph-cluster/access-control-rule.yaml similarity index 100% rename from infra/rook-ceph-cluster/access-control-rule.yaml rename to infra/rook-ceph/rook-ceph-cluster/access-control-rule.yaml diff --git a/infra/rook-ceph-cluster/helm-release.yaml b/infra/rook-ceph/rook-ceph-cluster/helm-release.yaml similarity index 100% rename from infra/rook-ceph-cluster/helm-release.yaml rename to infra/rook-ceph/rook-ceph-cluster/helm-release.yaml diff --git a/infra/rook-ceph-cluster/kustomization.yaml b/infra/rook-ceph/rook-ceph-cluster/kustomization.yaml similarity index 82% rename from infra/rook-ceph-cluster/kustomization.yaml rename to infra/rook-ceph/rook-ceph-cluster/kustomization.yaml index 2ec90df..0dac41f 100644 --- a/infra/rook-ceph-cluster/kustomization.yaml +++ b/infra/rook-ceph/rook-ceph-cluster/kustomization.yaml @@ -6,7 +6,7 @@ resources: - ./access-control-rule.yaml configurations: - - ../../common/name-reference/helm-release.yaml + - ../../../common/name-reference/helm-release.yaml configMapGenerator: - name: rook-cepth-cluster-values diff --git a/infra/rook-ceph-cluster/values.yaml b/infra/rook-ceph/rook-ceph-cluster/values.yaml similarity index 100% rename from infra/rook-ceph-cluster/values.yaml rename to infra/rook-ceph/rook-ceph-cluster/values.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/rook-ceph.yaml b/infra/rook-ceph/rook-ceph.yaml similarity index 88% rename from clusters/titan.lan.huizinga.dev/infra/rook-ceph.yaml rename to infra/rook-ceph/rook-ceph.yaml index 14c9cc9..6c72244 100644 --- a/clusters/titan.lan.huizinga.dev/infra/rook-ceph.yaml +++ b/infra/rook-ceph/rook-ceph.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/rook-ceph + path: ./infra/rook-ceph/rook-ceph prune: true timeout: 2m sourceRef: diff --git a/infra/rook-ceph/helm-release.yaml b/infra/rook-ceph/rook-ceph/helm-release.yaml similarity index 100% rename from infra/rook-ceph/helm-release.yaml rename to infra/rook-ceph/rook-ceph/helm-release.yaml diff --git a/infra/rook-ceph/helm-repository.yaml b/infra/rook-ceph/rook-ceph/helm-repository.yaml similarity index 100% rename from infra/rook-ceph/helm-repository.yaml rename to infra/rook-ceph/rook-ceph/helm-repository.yaml diff --git a/infra/rook-ceph/rook-ceph/kustomization.yaml b/infra/rook-ceph/rook-ceph/kustomization.yaml new file mode 100644 index 0000000..b6ce735 --- /dev/null +++ b/infra/rook-ceph/rook-ceph/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: rook-ceph +resources: + - ./namespace.yaml + - ./helm-repository.yaml + - ./helm-release.yaml diff --git a/infra/rook-ceph/namespace.yaml b/infra/rook-ceph/rook-ceph/namespace.yaml similarity index 100% rename from infra/rook-ceph/namespace.yaml rename to infra/rook-ceph/rook-ceph/namespace.yaml diff --git a/infra/topolvm/kustomization.yaml b/infra/topolvm/kustomization.yaml index 5ff6d46..2aad616 100644 --- a/infra/topolvm/kustomization.yaml +++ b/infra/topolvm/kustomization.yaml @@ -1,16 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: topolvm-system resources: - - ./namespace.yaml - - ./helm-repository.yaml - - ./helm-release.yaml - - ./volume-snapshot-class.yaml - -configurations: - - ../../common/name-reference/helm-release.yaml - -configMapGenerator: - - name: topolvm-values - files: - - ./values.yaml + - ./topolvm.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/topolvm.yaml b/infra/topolvm/topolvm.yaml similarity index 90% rename from clusters/titan.lan.huizinga.dev/infra/topolvm.yaml rename to infra/topolvm/topolvm.yaml index 52bca5d..0d66f15 100644 --- a/clusters/titan.lan.huizinga.dev/infra/topolvm.yaml +++ b/infra/topolvm/topolvm.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/topolvm + path: ./infra/topolvm/topolvm dependsOn: - name: cert-manager prune: true diff --git a/infra/topolvm/helm-release.yaml b/infra/topolvm/topolvm/helm-release.yaml similarity index 100% rename from infra/topolvm/helm-release.yaml rename to infra/topolvm/topolvm/helm-release.yaml diff --git a/infra/topolvm/helm-repository.yaml b/infra/topolvm/topolvm/helm-repository.yaml similarity index 100% rename from infra/topolvm/helm-repository.yaml rename to infra/topolvm/topolvm/helm-repository.yaml diff --git a/infra/topolvm/topolvm/kustomization.yaml b/infra/topolvm/topolvm/kustomization.yaml new file mode 100644 index 0000000..fdcabd1 --- /dev/null +++ b/infra/topolvm/topolvm/kustomization.yaml @@ -0,0 +1,16 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: topolvm-system +resources: + - ./namespace.yaml + - ./helm-repository.yaml + - ./helm-release.yaml + - ./volume-snapshot-class.yaml + +configurations: + - ../../../common/name-reference/helm-release.yaml + +configMapGenerator: + - name: topolvm-values + files: + - ./values.yaml diff --git a/infra/topolvm/namespace.yaml b/infra/topolvm/topolvm/namespace.yaml similarity index 100% rename from infra/topolvm/namespace.yaml rename to infra/topolvm/topolvm/namespace.yaml diff --git a/infra/topolvm/values.yaml b/infra/topolvm/topolvm/values.yaml similarity index 100% rename from infra/topolvm/values.yaml rename to infra/topolvm/topolvm/values.yaml diff --git a/infra/topolvm/volume-snapshot-class.yaml b/infra/topolvm/topolvm/volume-snapshot-class.yaml similarity index 100% rename from infra/topolvm/volume-snapshot-class.yaml rename to infra/topolvm/topolvm/volume-snapshot-class.yaml diff --git a/infra/traefik/kustomization.yaml b/infra/traefik/kustomization.yaml index 351d6c3..79f61c4 100644 --- a/infra/traefik/kustomization.yaml +++ b/infra/traefik/kustomization.yaml @@ -1,16 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: traefik resources: - - ./namespace.yaml - - ./helm-repository.yaml - - ./helm-release.yaml - - ./access-control-rule.yaml - -configurations: - - ../../common/name-reference/helm-release.yaml - -configMapGenerator: - - name: traefik-values - files: - - ./values.yaml + - ./traefik-middleware.yaml + - ./traefik.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/traefik-middleware.yaml b/infra/traefik/traefik-middleware.yaml similarity index 87% rename from clusters/titan.lan.huizinga.dev/infra/traefik-middleware.yaml rename to infra/traefik/traefik-middleware.yaml index bd69267..790b2b1 100644 --- a/clusters/titan.lan.huizinga.dev/infra/traefik-middleware.yaml +++ b/infra/traefik/traefik-middleware.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/traefik-middleware + path: ./infra/traefik/traefik-middleware dependsOn: - name: traefik prune: true diff --git a/infra/traefik-middleware/default-headers.yaml b/infra/traefik/traefik-middleware/default-headers.yaml similarity index 100% rename from infra/traefik-middleware/default-headers.yaml rename to infra/traefik/traefik-middleware/default-headers.yaml diff --git a/infra/traefik-middleware/kustomization.yaml b/infra/traefik/traefik-middleware/kustomization.yaml similarity index 100% rename from infra/traefik-middleware/kustomization.yaml rename to infra/traefik/traefik-middleware/kustomization.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/traefik.yaml b/infra/traefik/traefik.yaml similarity index 92% rename from clusters/titan.lan.huizinga.dev/infra/traefik.yaml rename to infra/traefik/traefik.yaml index b3017b3..90be3cc 100644 --- a/clusters/titan.lan.huizinga.dev/infra/traefik.yaml +++ b/infra/traefik/traefik.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/traefik + path: ./infra/traefik/traefik dependsOn: - name: letsencrypt prune: true diff --git a/infra/traefik/access-control-rule.yaml b/infra/traefik/traefik/access-control-rule.yaml similarity index 100% rename from infra/traefik/access-control-rule.yaml rename to infra/traefik/traefik/access-control-rule.yaml diff --git a/infra/traefik/helm-release.yaml b/infra/traefik/traefik/helm-release.yaml similarity index 100% rename from infra/traefik/helm-release.yaml rename to infra/traefik/traefik/helm-release.yaml diff --git a/infra/traefik/helm-repository.yaml b/infra/traefik/traefik/helm-repository.yaml similarity index 100% rename from infra/traefik/helm-repository.yaml rename to infra/traefik/traefik/helm-repository.yaml diff --git a/infra/traefik/traefik/kustomization.yaml b/infra/traefik/traefik/kustomization.yaml new file mode 100644 index 0000000..86e114a --- /dev/null +++ b/infra/traefik/traefik/kustomization.yaml @@ -0,0 +1,16 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: traefik +resources: + - ./namespace.yaml + - ./helm-repository.yaml + - ./helm-release.yaml + - ./access-control-rule.yaml + +configurations: + - ../../../common/name-reference/helm-release.yaml + +configMapGenerator: + - name: traefik-values + files: + - ./values.yaml diff --git a/infra/traefik/namespace.yaml b/infra/traefik/traefik/namespace.yaml similarity index 100% rename from infra/traefik/namespace.yaml rename to infra/traefik/traefik/namespace.yaml diff --git a/infra/traefik/values.yaml b/infra/traefik/traefik/values.yaml similarity index 100% rename from infra/traefik/values.yaml rename to infra/traefik/traefik/values.yaml diff --git a/infra/velero/kustomization.yaml b/infra/velero/kustomization.yaml index 4b083e5..baed583 100644 --- a/infra/velero/kustomization.yaml +++ b/infra/velero/kustomization.yaml @@ -1,17 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: velero resources: - - ./namespace.yaml - - ./helm-repository.yaml - - ./secret-s3-credentials.yaml - - ./secret-velero-repo-credentials.yaml - - ./helm-release.yaml - -configurations: - - ../../common/name-reference/helm-release.yaml - -configMapGenerator: - - name: velero-values - files: - - ./values.yaml + - ./velero.yaml diff --git a/clusters/titan.lan.huizinga.dev/infra/velero.yaml b/infra/velero/velero.yaml similarity index 92% rename from clusters/titan.lan.huizinga.dev/infra/velero.yaml rename to infra/velero/velero.yaml index f7eda2c..a42c892 100644 --- a/clusters/titan.lan.huizinga.dev/infra/velero.yaml +++ b/infra/velero/velero.yaml @@ -7,7 +7,7 @@ metadata: alert: flux-infra spec: interval: 15m - path: ./infra/velero + path: ./infra/velero/velero dependsOn: - name: external-snapshotter prune: true diff --git a/infra/velero/helm-release.yaml b/infra/velero/velero/helm-release.yaml similarity index 100% rename from infra/velero/helm-release.yaml rename to infra/velero/velero/helm-release.yaml diff --git a/infra/velero/helm-repository.yaml b/infra/velero/velero/helm-repository.yaml similarity index 100% rename from infra/velero/helm-repository.yaml rename to infra/velero/velero/helm-repository.yaml diff --git a/infra/velero/velero/kustomization.yaml b/infra/velero/velero/kustomization.yaml new file mode 100644 index 0000000..1733f4b --- /dev/null +++ b/infra/velero/velero/kustomization.yaml @@ -0,0 +1,17 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: velero +resources: + - ./namespace.yaml + - ./helm-repository.yaml + - ./secret-s3-credentials.yaml + - ./secret-velero-repo-credentials.yaml + - ./helm-release.yaml + +configurations: + - ../../../common/name-reference/helm-release.yaml + +configMapGenerator: + - name: velero-values + files: + - ./values.yaml diff --git a/infra/velero/namespace.yaml b/infra/velero/velero/namespace.yaml similarity index 100% rename from infra/velero/namespace.yaml rename to infra/velero/velero/namespace.yaml diff --git a/infra/velero/secret-s3-credentials.yaml b/infra/velero/velero/secret-s3-credentials.yaml similarity index 100% rename from infra/velero/secret-s3-credentials.yaml rename to infra/velero/velero/secret-s3-credentials.yaml diff --git a/infra/velero/secret-velero-repo-credentials.yaml b/infra/velero/velero/secret-velero-repo-credentials.yaml similarity index 100% rename from infra/velero/secret-velero-repo-credentials.yaml rename to infra/velero/velero/secret-velero-repo-credentials.yaml diff --git a/infra/velero/values.yaml b/infra/velero/velero/values.yaml similarity index 100% rename from infra/velero/values.yaml rename to infra/velero/velero/values.yaml