Merge pull request #5231 from nojnhuh/ctrd-device-plugin

Revert "simplify DRA config for containerd"
kubernetes-sigs · Nov 1, 2024 · 90d9b4b · 90d9b4b
2 parents 3d2c868 + a3bfa70
commit 90d9b4b
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 36 deletions.
diff --git a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml
diff --git a/templates/test/ci/patches/dra-kubeadmconfig.yaml b/templates/test/ci/patches/dra-kubeadmconfig.yaml
@@ -2,13 +2,14 @@
   path: /spec/files/-
   value:
     content: |
-      version = 2
-      [plugins]
-        [plugins."io.containerd.grpc.v1.cri"]
-          enable_cdi = true
+      #!/bin/bash
+
+      echo "enabling containerd CDI plugin"
+      sed -i '/\[plugins."io.containerd.grpc.v1.cri"\]/a\    enable_cdi = true' /etc/containerd/config.toml
+      systemctl restart containerd
     owner: root:root
-    path: /etc/containerd/conf.d/device-plugin.toml
-    permissions: "0644"
+    path: /tmp/containerd-config.sh
+    permissions: "0744"
 - op: add
   path: /spec/preKubeadmCommands/0
   value: bash -c /tmp/containerd-config.sh

diff --git a/templates/test/ci/patches/dra-kubeadmcontrolplane.yaml b/templates/test/ci/patches/dra-kubeadmcontrolplane.yaml
@@ -2,13 +2,17 @@
   path: /spec/kubeadmConfigSpec/files/-
   value:
     content: |
-      version = 2
-      [plugins]
-        [plugins."io.containerd.grpc.v1.cri"]
-          enable_cdi = true
+      #!/bin/bash
+
+      echo "enabling containerd CDI plugin"
+      sed -i '/\[plugins."io.containerd.grpc.v1.cri"\]/a\    enable_cdi = true' /etc/containerd/config.toml
+      systemctl restart containerd
     owner: root:root
-    path: /etc/containerd/conf.d/device-plugin.toml
-    permissions: "0644"
+    path: /tmp/containerd-config.sh
+    permissions: "0744"
+- op: add
+  path: /spec/kubeadmConfigSpec/preKubeadmCommands/0
+  value: bash -c /tmp/containerd-config.sh
 - op: add
   path: /spec/kubeadmConfigSpec/clusterConfiguration/apiServer/extraArgs/feature-gates
   value: ${K8S_FEATURE_GATES:-"DynamicResourceAllocation=true"}

diff --git a/templates/test/dev/cluster-template-custom-builds-dra.yaml b/templates/test/dev/cluster-template-custom-builds-dra.yaml