daemonset restructuring

infrastructure/core/base/kustomization.yaml

@@ -0,0 +1,6 @@
+# infrastructure/core/base/kustomization.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - storageclass
+  - priorityclass

infrastructure/core/base/priorityclass/kustomization.yaml

@@ -1,4 +1,4 @@
-# infrastructure/core/priorityclass/kustomization.yaml
+# infrastructure/core/base/priorityclass/kustomization.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:

infrastructure/core/base/priorityclass/scavenger.yaml

@@ -1,4 +1,4 @@
-# infrastructure/core/priorityclass/scavenger.yaml
+# infrastructure/core/base/priorityclass/scavenger.yaml
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:

infrastructure/core/base/storageclass/asteria.yaml

@@ -1,4 +1,4 @@
-# infrastructure/core/storageclass/asteria.yaml
+# infrastructure/core/base/storageclass/asteria.yaml
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:

infrastructure/core/base/storageclass/astreae.yaml

@@ -1,4 +1,4 @@
-# infrastructure/core/storageclass/astreae.yaml
+# infrastructure/core/base/storageclass/astreae.yaml
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:

infrastructure/core/base/storageclass/kustomization.yaml

@@ -1,4 +1,4 @@
-# infrastructure/core/storageclass/kustomization.yaml
+# infrastructure/core/base/storageclass/kustomization.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:

infrastructure/core/daemonsets/device-plugin-jetson/kustomization.yaml

@@ -1,4 +0,0 @@
-# infrastructure/core/daemonsets/device-plugin-jetson/kustomization.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources: [daemonset.yaml]

infrastructure/core/daemonsets/device-plugin-minipc/kustomization.yaml

@@ -1,4 +0,0 @@
-# infrastructure/core/daemonsets/device-plugin-minipc/kustomization.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources: [daemonset.yaml]

infrastructure/core/daemonsets/kustomization-device-plugin-jetson.yaml

@@ -1,15 +0,0 @@
-# infrastructure/core/daemonsets/kustomization-device-plugin-jetson.yaml
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: nvidia-device-plugin-jetson
-  namespace: flux-system
-spec:
-  suspend: true
-  interval: 10m
-  path: ./infrastructure/core/daemonsets/device-plugin-jetson
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-    namespace: flux-system

infrastructure/core/daemonsets/kustomization-device-plugin-minipc.yaml

@@ -1,15 +0,0 @@
-# infrastructure/core/daemonsets/kustomization-device-plugin-minipc.yaml
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: nvidia-device-plugin-minipc
-  namespace: flux-system
-spec:
-  suspend: false
-  interval: 10m
-  path: ./infrastructure/core/daemonsets/device-plugin-minipc
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-    namespace: flux-system

infrastructure/core/gpu/device-plugin-jetson/daemonset.yaml

@@ -1,4 +1,4 @@
-# infrastructure/core/daemonsets/device-plugin-jetson/daemonset.yaml
+# infrastructure/core/gpu/daemonsets/device-plugin-jetson/daemonset.yaml
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:

infrastructure/core/gpu/device-plugin-jetson/kustomization.yaml

@@ -0,0 +1,5 @@
+# infrastructure/core/gpu/daemonsets/device-plugin-jetson/kustomization.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources: 
+  - daemonset.yaml

infrastructure/core/gpu/device-plugin-minipc/daemonset.yaml

@@ -1,4 +1,4 @@
-# infrastructure/core/daemonsets/device-plugin-minipc/daemonset.yaml
+# infrastructure/core/gpu/daemonsets/device-plugin-minipc/daemonset.yaml
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:

infrastructure/core/gpu/device-plugin-minipc/kustomization.yaml

@@ -0,0 +1,5 @@
+# infrastructure/core/gpu/daemonsets/device-plugin-minipc/kustomization.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources: 
+  - daemonset.yaml

infrastructure/core/gpu/profiles/jetson-only/kustomization.yaml

@@ -0,0 +1,5 @@
+# infrastructure/core/gpu/daemonsets/profiles/jetson-only/kustomization.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../device-plugin-jetson

infrastructure/core/gpu/profiles/minipc-and-jetson/kustomization.yaml

@@ -0,0 +1,6 @@
+# infrastructure/core/gpu/daemonsets/profiles/minipc-and-jetson/kustomization.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../device-plugin-minipc
+  - ../../device-plugin-jetson

infrastructure/core/gpu/profiles/minipc-only/kustomization.yaml

@@ -0,0 +1,5 @@
+# infrastructure/core/gpu/daemonsets/profiles/minipc-only/kustomization.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../device-plugin-minipc

infrastructure/core/kustomization.yaml

@@ -2,9 +2,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./storageclass
+  - base
-  - ./priorityclass
+  - gpu/profiles/jetson-only 
-  - ./daemonsets/device-plugin-minipc
+  # - gpu/profiles/minipc-and-jetson
-  - ./daemonsets/device-plugin-jetson
+  # - gpu/profiles/minipc-only 
-  # - ./daemonsets/kustomization-device-plugin-minipc.yaml
-  # - ./daemonsets/kustomization-device-plugin-jetson.yaml

infrastructure/flux-system/kustomization-core.yaml

@@ -7,10 +7,16 @@ metadata:
 spec:
   interval: 10m
   path: ./infrastructure/core
-  prune: false
+  prune: true
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
   wait: true
 
+  # Only wait for the NVIDIA device-plugin DaemonSet on titan-22
+  healthChecks:
+    - apiVersion: apps/v1
+      kind: DaemonSet
+      name: nvidia-device-plugin-minipc
+      namespace: kube-system