diff --git a/kubernetes/apps/kube-system/kustomization.yaml b/kubernetes/apps/kube-system/kustomization.yaml index dffbddda..0574ff88 100644 --- a/kubernetes/apps/kube-system/kustomization.yaml +++ b/kubernetes/apps/kube-system/kustomization.yaml @@ -10,6 +10,7 @@ resources: - ./descheduler/ks.yaml - ./fstrim/ks.yaml - ./metrics-server/ks.yaml + - ./nvidia-device-plugin/ks.yaml - ./node-feature-discovery/ks.yaml - ./reloader/ks.yaml - ./spegel/ks.yaml diff --git a/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/config/config.yml b/kubernetes/apps/kube-system/nvidia-device-plugin/app/config/config.yml similarity index 100% rename from kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/config/config.yml rename to kubernetes/apps/kube-system/nvidia-device-plugin/app/config/config.yml diff --git a/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/helmrelease.yaml b/kubernetes/apps/kube-system/nvidia-device-plugin/app/helmrelease.yaml similarity index 95% rename from kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/helmrelease.yaml rename to kubernetes/apps/kube-system/nvidia-device-plugin/app/helmrelease.yaml index cf0d0131..4e0851ed 100644 --- a/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/helmrelease.yaml +++ b/kubernetes/apps/kube-system/nvidia-device-plugin/app/helmrelease.yaml @@ -4,7 +4,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: nvidia-device-plugin - namespace: nvidia-device-plugin spec: interval: 30m chart: diff --git a/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/kustomization.yaml b/kubernetes/apps/kube-system/nvidia-device-plugin/app/kustomization.yaml similarity index 100% rename from kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/kustomization.yaml rename to kubernetes/apps/kube-system/nvidia-device-plugin/app/kustomization.yaml diff --git a/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/runtimeclass.yaml b/kubernetes/apps/kube-system/nvidia-device-plugin/app/runtimeclass.yaml similarity index 100% rename from kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/runtimeclass.yaml rename to kubernetes/apps/kube-system/nvidia-device-plugin/app/runtimeclass.yaml diff --git a/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/ks.yaml b/kubernetes/apps/kube-system/nvidia-device-plugin/ks.yaml similarity index 78% rename from kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/ks.yaml rename to kubernetes/apps/kube-system/nvidia-device-plugin/ks.yaml index 403bb44c..d3de8b24 100644 --- a/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/ks.yaml +++ b/kubernetes/apps/kube-system/nvidia-device-plugin/ks.yaml @@ -8,9 +8,9 @@ metadata: labels: substitution.flux.home.arpa/enabled: "true" spec: - targetNamespace: nvidia-device-plugin + targetNamespace: kube-system interval: 10m - path: "./kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app" + path: "./kubernetes/apps/kube-system/nvidia-device-plugin/app" prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/apps/nvidia-device-plugin/kustomization.yaml b/kubernetes/apps/nvidia-device-plugin/kustomization.yaml deleted file mode 100644 index bc691c5b..00000000 --- a/kubernetes/apps/nvidia-device-plugin/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - # Pre Flux-Kustomizations - - ./namespace.yaml - # Flux-Kustomizations - - ./nvidia-device-plugin/ks.yaml diff --git a/kubernetes/apps/nvidia-device-plugin/namespace.yaml b/kubernetes/apps/nvidia-device-plugin/namespace.yaml deleted file mode 100644 index f7ddb2a7..00000000 --- a/kubernetes/apps/nvidia-device-plugin/namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: nvidia-device-plugin - labels: - kustomize.toolkit.fluxcd.io/prune: disabled