Set force cgroup env for k3s agent as well

KevinJoiner · Nov 2, 2022 · d4d9741 · d4d9741
1 parent c4dd7a5
commit d4d9741
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/tests/integration/pkg/nodeconfig/nodeconfig.go b/tests/integration/pkg/nodeconfig/nodeconfig.go
@@ -98,6 +98,10 @@ write_files:
     [Service]
     Type=exec
   path: /etc/systemd/system/k3s.service.d/10-delegate.conf
+- content: |
+    [Service]
+    Type=exec
+  path: /etc/systemd/system/k3s-agent.service.d/10-delegate.conf
 - content: |
     NOTIFY_SOCKET=
     INVOCATION_ID=
@@ -109,7 +113,12 @@ write_files:
 - content: |
     NOTIFY_SOCKET=
     INVOCATION_ID=
-  path: /etc/default/k3s`
+  path: /etc/default/k3s
+- content: |
+    NOTIFY_SOCKET=
+    INVOCATION_ID=
+  path: /etc/default/k3s-agent`
+
 	podConfigClient := clients.Dynamic.Resource(schema.GroupVersionResource{
 		Group:    "rke-machine-config.cattle.io",
 		Version:  "v1",

diff --git a/tests/integration/pkg/systemdnode/systemnode.go b/tests/integration/pkg/systemdnode/systemnode.go
@@ -107,6 +107,11 @@ INVOCATION_ID=
 						MountPath: "/usr/local/lib/systemd/system/k3s.service.d/10-delegate.conf",
 						SubPath:   "dropin",
 					},
+					{
+						Name:      "systemd",
+						MountPath: "/usr/local/lib/systemd/system/k3s-agent.service.d/10-delegate.conf",
+						SubPath:   "dropin",
+					},
 					{
 						Name:      "systemd",
 						MountPath: "/etc/default/rke2-server",
@@ -122,6 +127,11 @@ INVOCATION_ID=
 						MountPath: "/etc/default/k3s",
 						SubPath:   "disable",
 					},
+					{
+						Name:      "systemd",
+						MountPath: "/etc/default/k3s-agent",
+						SubPath:   "disable",
+					},
 				},
 			}},
 			AutomountServiceAccountToken: new(bool),