kola/kubeadm/test: adjust testdata to templates

we now handle the `cgroup` driver
flatcar · Aug 12, 2021 · 1cd3c2f · 1cd3c2f
1 parent c1ae47c
commit 1cd3c2f
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/kola/tests/kubeadm/testdata/master-calico-script.sh b/kola/tests/kubeadm/testdata/master-calico-script.sh
@@ -33,12 +33,22 @@ curl --retry-delay 1 \
     -sSL \
     "https://github.com/raw/kubernetes/release/${RELEASE_VERSION}/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf" |
     sed "s:/usr/bin:${DOWNLOAD_DIR}:g" > /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
-
+
+
+# we get the node cgroup driver
+# in order to pass the params to the
+# kubelet config for both controller and worker
+cgroup=$(docker info | awk '/Cgroup Driver/ { print $3}')
+
 # we create the kubeadm config
 # plugin-volume-dir and flex-volume-plugin-dir are required since /usr is read-only mounted
 # etcd is also defined as external. The provided one has some issues with docker and selinux
 # (permission denied with /var/lib/etcd) so it can't boot properly
 cat << EOF > kubeadm-config.yaml
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+cgroupDriver: ${cgroup}
+---
 apiVersion: kubeadm.k8s.io/v1beta2
 kind: InitConfiguration
 nodeRegistration:
@@ -117,4 +127,8 @@ controlPlane:
 nodeRegistration:
   kubeletExtraArgs:
     volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+cgroupDriver: ${cgroup}
 EOF
diff --git a/kola/tests/kubeadm/testdata/master-cilium-script.sh b/kola/tests/kubeadm/testdata/master-cilium-script.sh
@@ -33,12 +33,22 @@ curl --retry-delay 1 \
     -sSL \
     "https://github.com/raw/kubernetes/release/${RELEASE_VERSION}/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf" |
     sed "s:/usr/bin:${DOWNLOAD_DIR}:g" > /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
-
+
+
+# we get the node cgroup driver
+# in order to pass the params to the
+# kubelet config for both controller and worker
+cgroup=$(docker info | awk '/Cgroup Driver/ { print $3}')
+
 # we create the kubeadm config
 # plugin-volume-dir and flex-volume-plugin-dir are required since /usr is read-only mounted
 # etcd is also defined as external. The provided one has some issues with docker and selinux
 # (permission denied with /var/lib/etcd) so it can't boot properly
 cat << EOF > kubeadm-config.yaml
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+cgroupDriver: ${cgroup}
+---
 apiVersion: kubeadm.k8s.io/v1beta2
 kind: InitConfiguration
 nodeRegistration:
@@ -102,4 +112,8 @@ controlPlane:
 nodeRegistration:
   kubeletExtraArgs:
     volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+cgroupDriver: ${cgroup}
 EOF
diff --git a/kola/tests/kubeadm/testdata/master-flannel-script.sh b/kola/tests/kubeadm/testdata/master-flannel-script.sh
@@ -33,12 +33,22 @@ curl --retry-delay 1 \
     -sSL \
     "https://github.com/raw/kubernetes/release/${RELEASE_VERSION}/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf" |
     sed "s:/usr/bin:${DOWNLOAD_DIR}:g" > /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
-
+
+
+# we get the node cgroup driver
+# in order to pass the params to the
+# kubelet config for both controller and worker
+cgroup=$(docker info | awk '/Cgroup Driver/ { print $3}')
+
 # we create the kubeadm config
 # plugin-volume-dir and flex-volume-plugin-dir are required since /usr is read-only mounted
 # etcd is also defined as external. The provided one has some issues with docker and selinux
 # (permission denied with /var/lib/etcd) so it can't boot properly
 cat << EOF > kubeadm-config.yaml
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+cgroupDriver: ${cgroup}
+---
 apiVersion: kubeadm.k8s.io/v1beta2
 kind: InitConfiguration
 nodeRegistration:
@@ -99,4 +109,8 @@ controlPlane:
 nodeRegistration:
   kubeletExtraArgs:
     volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+cgroupDriver: ${cgroup}
 EOF