update test cases to use the systemd cgroup_driver

r-tierney · david22swan · commit 72bef4a3a06e · 2023-06-05T11:59:20.000+01:00
diff --git a/spec/acceptance/kubernetes_spec.rb b/spec/acceptance/kubernetes_spec.rb
@@ -25,7 +25,7 @@ class {'kubernetes':
               schedule_on_controller => true,
               environment  => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf'],
               ignore_preflight_errors => ['NumCPU','ExternalEtcdVersion'],
-              cgroup_driver => 'cgroupfs',
+              cgroup_driver => 'systemd',
             }
           }
           /^(Debian|Ubuntu)$/: {
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
@@ -81,21 +81,21 @@ class {'kubernetes':
       schedule_on_controller => true,
       environment  => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf'],
       ignore_preflight_errors => ['NumCPU','ExternalEtcdVersion'],
-      cgroup_driver => 'cgroupfs',
+      cgroup_driver => 'systemd',
     }
   }
   node /#{worker1}/ {
     class {'kubernetes':
       worker => true,
       manage_docker => false,
-      cgroup_driver => 'cgroupfs',
+      cgroup_driver => 'systemd',
     }
   }
   node /#{worker2}/  {
     class {'kubernetes':
       worker => true,
       manage_docker => false,
-      cgroup_driver => 'cgroupfs',
+      cgroup_driver => 'systemd',
     }
   }
   EOS

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class {'kubernetes':`
`25`	`25`	`schedule_on_controller => true,`
`26`	`26`	`environment => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf'],`
`27`	`27`	`ignore_preflight_errors => ['NumCPU','ExternalEtcdVersion'],`
`28`		`- cgroup_driver => 'cgroupfs',`
	`28`	`+ cgroup_driver => 'systemd',`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`/^(Debian\|Ubuntu)$/: {`
Original file line number	Diff line number	Diff line change
`@@ -81,21 +81,21 @@ class {'kubernetes':`
`81`	`81`	`schedule_on_controller => true,`
`82`	`82`	`environment => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf'],`
`83`	`83`	`ignore_preflight_errors => ['NumCPU','ExternalEtcdVersion'],`
`84`		`- cgroup_driver => 'cgroupfs',`
	`84`	`+ cgroup_driver => 'systemd',`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`node /#{worker1}/ {`
`88`	`88`	`class {'kubernetes':`
`89`	`89`	`worker => true,`
`90`	`90`	`manage_docker => false,`
`91`		`- cgroup_driver => 'cgroupfs',`
	`91`	`+ cgroup_driver => 'systemd',`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`node /#{worker2}/ {`
`95`	`95`	`class {'kubernetes':`
`96`	`96`	`worker => true,`
`97`	`97`	`manage_docker => false,`
`98`		`- cgroup_driver => 'cgroupfs',`
	`98`	`+ cgroup_driver => 'systemd',`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`EOS`