diff --git a/kubernetes/flux/cluster/ks.yaml b/kubernetes/flux/cluster/ks.yaml index ab3c9d7b4ebd7..9da9f85b00549 100644 --- a/kubernetes/flux/cluster/ks.yaml +++ b/kubernetes/flux/cluster/ks.yaml @@ -3,9 +3,13 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: cluster-meta + name: &app cluster-meta namespace: flux-system spec: + targetNamespace: flux-system + commonMetadata: + labels: + app.kubernetes.io/name: *app interval: 30m path: ./kubernetes/flux/meta prune: true diff --git a/kubernetes/flux/meta/kustomization.yaml b/kubernetes/flux/meta/kustomization.yaml index e72a3a33cec08..24a9b1c4a34c0 100644 --- a/kubernetes/flux/meta/kustomization.yaml +++ b/kubernetes/flux/meta/kustomization.yaml @@ -2,7 +2,6 @@ # yaml-language-server: $schema=https://json.schemastore.org/kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: flux-system resources: - ./repositories - ./settings diff --git a/kubernetes/flux/meta/repositories/git/kustomization.yaml b/kubernetes/flux/meta/repositories/git/kustomization.yaml index 9a9b327efc48c..8fb7c1427d883 100644 --- a/kubernetes/flux/meta/repositories/git/kustomization.yaml +++ b/kubernetes/flux/meta/repositories/git/kustomization.yaml @@ -2,5 +2,4 @@ # yaml-language-server: $schema=https://json.schemastore.org/kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: flux-system resources: [] diff --git a/kubernetes/flux/meta/repositories/helm/actions-runner-controller.yaml b/kubernetes/flux/meta/repositories/helm/actions-runner-controller.yaml index 54fa67be8f8a3..cccd5a8520e5d 100644 --- a/kubernetes/flux/meta/repositories/helm/actions-runner-controller.yaml +++ b/kubernetes/flux/meta/repositories/helm/actions-runner-controller.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: actions-runner-controller - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/backube.yaml b/kubernetes/flux/meta/repositories/helm/backube.yaml index 4ba0742ca8581..a16fc7bc50f57 100644 --- a/kubernetes/flux/meta/repositories/helm/backube.yaml +++ b/kubernetes/flux/meta/repositories/helm/backube.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: backube - namespace: flux-system spec: interval: 2h url: https://backube.github.io/helm-charts/ diff --git a/kubernetes/flux/meta/repositories/helm/bitnami.yaml b/kubernetes/flux/meta/repositories/helm/bitnami.yaml index 9f84188c5a342..9bda74ebcdfe4 100644 --- a/kubernetes/flux/meta/repositories/helm/bitnami.yaml +++ b/kubernetes/flux/meta/repositories/helm/bitnami.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: bitnami - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/bjw-s.yaml b/kubernetes/flux/meta/repositories/helm/bjw-s.yaml index c32ccd8de5281..efdb2f6098ff6 100644 --- a/kubernetes/flux/meta/repositories/helm/bjw-s.yaml +++ b/kubernetes/flux/meta/repositories/helm/bjw-s.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: bjw-s - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/cilium.yaml b/kubernetes/flux/meta/repositories/helm/cilium.yaml index 2cd7146d9dd18..fa4d1b9bee780 100644 --- a/kubernetes/flux/meta/repositories/helm/cilium.yaml +++ b/kubernetes/flux/meta/repositories/helm/cilium.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: cilium - namespace: flux-system spec: interval: 2h url: https://helm.cilium.io diff --git a/kubernetes/flux/meta/repositories/helm/cloudnative-pg.yaml b/kubernetes/flux/meta/repositories/helm/cloudnative-pg.yaml index 4b2f0e615455d..9eb26bec5a981 100644 --- a/kubernetes/flux/meta/repositories/helm/cloudnative-pg.yaml +++ b/kubernetes/flux/meta/repositories/helm/cloudnative-pg.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: cloudnative-pg - namespace: flux-system spec: interval: 2h url: https://cloudnative-pg.github.io/charts diff --git a/kubernetes/flux/meta/repositories/helm/controlplaneio.yaml b/kubernetes/flux/meta/repositories/helm/controlplaneio.yaml index 1fdfdb5953d42..9e01ed6ee1144 100644 --- a/kubernetes/flux/meta/repositories/helm/controlplaneio.yaml +++ b/kubernetes/flux/meta/repositories/helm/controlplaneio.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: controlplaneio - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/coredns.yaml b/kubernetes/flux/meta/repositories/helm/coredns.yaml index ed0bb65a96870..68fba456f149c 100644 --- a/kubernetes/flux/meta/repositories/helm/coredns.yaml +++ b/kubernetes/flux/meta/repositories/helm/coredns.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: coredns - namespace: flux-system spec: interval: 2h url: https://coredns.github.io/helm diff --git a/kubernetes/flux/meta/repositories/helm/crossplane.yaml b/kubernetes/flux/meta/repositories/helm/crossplane.yaml index ed89958906c0f..d456c66227bed 100644 --- a/kubernetes/flux/meta/repositories/helm/crossplane.yaml +++ b/kubernetes/flux/meta/repositories/helm/crossplane.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: crossplane - namespace: flux-system spec: interval: 2h url: https://charts.crossplane.io/stable diff --git a/kubernetes/flux/meta/repositories/helm/crunchydata.yaml b/kubernetes/flux/meta/repositories/helm/crunchydata.yaml index 011b1376b41c9..e84f723d8cb5c 100644 --- a/kubernetes/flux/meta/repositories/helm/crunchydata.yaml +++ b/kubernetes/flux/meta/repositories/helm/crunchydata.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: crunchydata - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/csi-driver-nfs.yaml b/kubernetes/flux/meta/repositories/helm/csi-driver-nfs.yaml index 869fce3957347..e5acd0316d056 100644 --- a/kubernetes/flux/meta/repositories/helm/csi-driver-nfs.yaml +++ b/kubernetes/flux/meta/repositories/helm/csi-driver-nfs.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: csi-driver-nfs - namespace: flux-system spec: interval: 2h url: https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts diff --git a/kubernetes/flux/meta/repositories/helm/descheduler.yaml b/kubernetes/flux/meta/repositories/helm/descheduler.yaml index 147045cd2d40d..adf186b877eb5 100644 --- a/kubernetes/flux/meta/repositories/helm/descheduler.yaml +++ b/kubernetes/flux/meta/repositories/helm/descheduler.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: descheduler - namespace: flux-system spec: interval: 2h url: https://kubernetes-sigs.github.io/descheduler diff --git a/kubernetes/flux/meta/repositories/helm/emqx.yaml b/kubernetes/flux/meta/repositories/helm/emqx.yaml index eed64ab20edff..6e2c7fc89178c 100644 --- a/kubernetes/flux/meta/repositories/helm/emqx.yaml +++ b/kubernetes/flux/meta/repositories/helm/emqx.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: emqx - namespace: flux-system spec: interval: 2h url: https://repos.emqx.io/charts diff --git a/kubernetes/flux/meta/repositories/helm/external-dns.yaml b/kubernetes/flux/meta/repositories/helm/external-dns.yaml index 2392dac23cc92..afb76fc2e00a1 100644 --- a/kubernetes/flux/meta/repositories/helm/external-dns.yaml +++ b/kubernetes/flux/meta/repositories/helm/external-dns.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: external-dns - namespace: flux-system spec: interval: 2h url: https://kubernetes-sigs.github.io/external-dns diff --git a/kubernetes/flux/meta/repositories/helm/external-secrets.yaml b/kubernetes/flux/meta/repositories/helm/external-secrets.yaml index 2acd768aff2d0..4aadf47b4960e 100644 --- a/kubernetes/flux/meta/repositories/helm/external-secrets.yaml +++ b/kubernetes/flux/meta/repositories/helm/external-secrets.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: external-secrets - namespace: flux-system spec: interval: 2h url: https://charts.external-secrets.io diff --git a/kubernetes/flux/meta/repositories/helm/fluxcd-community.yaml b/kubernetes/flux/meta/repositories/helm/fluxcd-community.yaml index dcea00831e353..7f25ad8920ab8 100644 --- a/kubernetes/flux/meta/repositories/helm/fluxcd-community.yaml +++ b/kubernetes/flux/meta/repositories/helm/fluxcd-community.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: fluxcd-community - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/grafana.yaml b/kubernetes/flux/meta/repositories/helm/grafana.yaml index eb1a6fb0cf220..a5ffbf3436216 100644 --- a/kubernetes/flux/meta/repositories/helm/grafana.yaml +++ b/kubernetes/flux/meta/repositories/helm/grafana.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: grafana - namespace: flux-system spec: interval: 2h url: https://grafana.github.io/helm-charts diff --git a/kubernetes/flux/meta/repositories/helm/ingress-nginx.yaml b/kubernetes/flux/meta/repositories/helm/ingress-nginx.yaml index 8e107adc6d075..b3319e00ff474 100644 --- a/kubernetes/flux/meta/repositories/helm/ingress-nginx.yaml +++ b/kubernetes/flux/meta/repositories/helm/ingress-nginx.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: ingress-nginx - namespace: flux-system spec: interval: 2h url: https://kubernetes.github.io/ingress-nginx diff --git a/kubernetes/flux/meta/repositories/helm/intel.yaml b/kubernetes/flux/meta/repositories/helm/intel.yaml index fb2c66b0870a0..1739e4dc04664 100644 --- a/kubernetes/flux/meta/repositories/helm/intel.yaml +++ b/kubernetes/flux/meta/repositories/helm/intel.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: intel - namespace: flux-system spec: interval: 2h url: https://intel.github.io/helm-charts diff --git a/kubernetes/flux/meta/repositories/helm/jetstack.yaml b/kubernetes/flux/meta/repositories/helm/jetstack.yaml index 4bc09d02a78fe..30b08b2e90631 100644 --- a/kubernetes/flux/meta/repositories/helm/jetstack.yaml +++ b/kubernetes/flux/meta/repositories/helm/jetstack.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: jetstack - namespace: flux-system spec: interval: 2h url: https://charts.jetstack.io/ diff --git a/kubernetes/flux/meta/repositories/helm/kustomization.yaml b/kubernetes/flux/meta/repositories/helm/kustomization.yaml index 721fe6f9e2ff1..d24ebc54eddcd 100644 --- a/kubernetes/flux/meta/repositories/helm/kustomization.yaml +++ b/kubernetes/flux/meta/repositories/helm/kustomization.yaml @@ -2,7 +2,6 @@ # yaml-language-server: $schema=https://json.schemastore.org/kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: flux-system resources: - ./actions-runner-controller.yaml - ./backube.yaml diff --git a/kubernetes/flux/meta/repositories/helm/kyverno.yaml b/kubernetes/flux/meta/repositories/helm/kyverno.yaml index b86efb0a7ad4f..a4866c01f662c 100644 --- a/kubernetes/flux/meta/repositories/helm/kyverno.yaml +++ b/kubernetes/flux/meta/repositories/helm/kyverno.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: kyverno - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/metrics-server.yaml b/kubernetes/flux/meta/repositories/helm/metrics-server.yaml index 5b2d20f03a5ac..7650f52536e0c 100644 --- a/kubernetes/flux/meta/repositories/helm/metrics-server.yaml +++ b/kubernetes/flux/meta/repositories/helm/metrics-server.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: metrics-server - namespace: flux-system spec: interval: 2h url: https://kubernetes-sigs.github.io/metrics-server diff --git a/kubernetes/flux/meta/repositories/helm/node-feature-discovery.yaml b/kubernetes/flux/meta/repositories/helm/node-feature-discovery.yaml index 5e45d5a828fcc..8b8496eabcbe9 100644 --- a/kubernetes/flux/meta/repositories/helm/node-feature-discovery.yaml +++ b/kubernetes/flux/meta/repositories/helm/node-feature-discovery.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: node-feature-discovery - namespace: flux-system spec: interval: 2h url: https://kubernetes-sigs.github.io/node-feature-discovery/charts diff --git a/kubernetes/flux/meta/repositories/helm/openebs.yaml b/kubernetes/flux/meta/repositories/helm/openebs.yaml index 139303866ebc7..28c84d7db487a 100644 --- a/kubernetes/flux/meta/repositories/helm/openebs.yaml +++ b/kubernetes/flux/meta/repositories/helm/openebs.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: openebs - namespace: flux-system spec: interval: 2h url: https://openebs.github.io/openebs diff --git a/kubernetes/flux/meta/repositories/helm/piraeus.yaml b/kubernetes/flux/meta/repositories/helm/piraeus.yaml index 4fe31ddb0ef5d..afdac20d34996 100644 --- a/kubernetes/flux/meta/repositories/helm/piraeus.yaml +++ b/kubernetes/flux/meta/repositories/helm/piraeus.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: piraeus - namespace: flux-system spec: interval: 2h url: https://piraeus.io/helm-charts/ diff --git a/kubernetes/flux/meta/repositories/helm/prometheus-community.yaml b/kubernetes/flux/meta/repositories/helm/prometheus-community.yaml index 78c4f0c0fd5df..d0afb651baf08 100644 --- a/kubernetes/flux/meta/repositories/helm/prometheus-community.yaml +++ b/kubernetes/flux/meta/repositories/helm/prometheus-community.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: prometheus-community - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/rook-ceph.yaml b/kubernetes/flux/meta/repositories/helm/rook-ceph.yaml index 30d2ab6ddf534..de29d8d2dcc45 100644 --- a/kubernetes/flux/meta/repositories/helm/rook-ceph.yaml +++ b/kubernetes/flux/meta/repositories/helm/rook-ceph.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: rook-ceph - namespace: flux-system spec: interval: 2h url: https://charts.rook.io/release diff --git a/kubernetes/flux/meta/repositories/helm/spegel.yaml b/kubernetes/flux/meta/repositories/helm/spegel.yaml index 0350b3adbcef3..9405a88532f50 100644 --- a/kubernetes/flux/meta/repositories/helm/spegel.yaml +++ b/kubernetes/flux/meta/repositories/helm/spegel.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: spegel - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/stakater.yaml b/kubernetes/flux/meta/repositories/helm/stakater.yaml index 838185d0666ef..cdc3874c56fab 100644 --- a/kubernetes/flux/meta/repositories/helm/stakater.yaml +++ b/kubernetes/flux/meta/repositories/helm/stakater.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: stakater - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/stevehipwell.yaml b/kubernetes/flux/meta/repositories/helm/stevehipwell.yaml index 832684b77777d..63043a20d3544 100644 --- a/kubernetes/flux/meta/repositories/helm/stevehipwell.yaml +++ b/kubernetes/flux/meta/repositories/helm/stevehipwell.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: stevehipwell - namespace: flux-system spec: type: oci interval: 5m diff --git a/kubernetes/flux/meta/repositories/helm/wiremind.yaml b/kubernetes/flux/meta/repositories/helm/wiremind.yaml index 52b242595190c..ecc9f81e9d103 100644 --- a/kubernetes/flux/meta/repositories/helm/wiremind.yaml +++ b/kubernetes/flux/meta/repositories/helm/wiremind.yaml @@ -4,7 +4,6 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: wiremind - namespace: flux-system spec: interval: 2h url: https://wiremind.github.io/wiremind-helm-charts/ diff --git a/kubernetes/flux/meta/repositories/kustomization.yaml b/kubernetes/flux/meta/repositories/kustomization.yaml index 7cbf47a5976a4..ae7e0ad4676c1 100644 --- a/kubernetes/flux/meta/repositories/kustomization.yaml +++ b/kubernetes/flux/meta/repositories/kustomization.yaml @@ -2,7 +2,6 @@ # yaml-language-server: $schema=https://json.schemastore.org/kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: flux-system resources: - ./git - ./helm diff --git a/kubernetes/flux/meta/repositories/oci/kustomization.yaml b/kubernetes/flux/meta/repositories/oci/kustomization.yaml index 9a9b327efc48c..8fb7c1427d883 100644 --- a/kubernetes/flux/meta/repositories/oci/kustomization.yaml +++ b/kubernetes/flux/meta/repositories/oci/kustomization.yaml @@ -2,5 +2,4 @@ # yaml-language-server: $schema=https://json.schemastore.org/kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: flux-system resources: [] diff --git a/kubernetes/flux/meta/settings/kustomization.yaml b/kubernetes/flux/meta/settings/kustomization.yaml index 9a9b327efc48c..8fb7c1427d883 100644 --- a/kubernetes/flux/meta/settings/kustomization.yaml +++ b/kubernetes/flux/meta/settings/kustomization.yaml @@ -2,5 +2,4 @@ # yaml-language-server: $schema=https://json.schemastore.org/kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: flux-system resources: []