Merge pull request #10846 from codablock/fix-systemd-cgroup

Actually enable systemd cgroup for containerd
kubernetes · Feb 16, 2021 · 87fadb1 · 87fadb1
2 parents 1bcfc66 + 16f3de2
commit 87fadb1
Show file tree

Hide file tree

Showing 91 changed files with 324 additions and 4 deletions.
diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go
@@ -62,6 +62,8 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
 				config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "registry", "mirrors", name, "endpoint"}, endpoints)
 			}
 			config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "containerd", "runtimes", "runc", "runtime_type"}, "io.containerd.runc.v2")
+			// only enable systemd cgroups for kubernetes >= 1.20
+			config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "containerd", "runtimes", "runc", "options", "SystemdCgroup"}, b.IsKubernetesGTE("1.20"))
 			if UsesKubenet(clusterSpec.Networking) {
 				// Using containerd with Kubenet requires special configuration.
 				// This is a temporary backwards-compatible solution for kubenet users and will be deprecated when Kubenet is deprecated:

diff --git a/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
@@ -162,6 +162,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
@@ -163,6 +163,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
 
               [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
                 runtime_type = "io.containerd.runc.v2"
+
+                [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                  SystemdCgroup = true
     logLevel: info
     version: 1.4.3
   docker:
@@ -524,6 +527,9 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa
 
               [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
                 runtime_type = "io.containerd.runc.v2"
+
+                [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                  SystemdCgroup = true
     logLevel: info
     version: 1.4.3
   docker:

diff --git a/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
@@ -162,6 +162,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
@@ -162,6 +162,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
@@ -144,7 +144,7 @@ function download-release() {
 echo "== nodeup node config starting =="
 ensure-install-dir
 
-echo "H4sIAAAAAAAA/+xWbW/bthN/709B9I+ibxrJSvLvNqEF5jndYizpNLvrBgzFQJNnmTBFqkdSiYd9+OFI2ZbTeN3Dyw0BEumedHe/391FaBvk1JqVqssRYw03vIaFt8hrmGruHLiSeQwwEtZ4rgzgPBivGijZXiIPSklRRIz3XQeISkLJfhsxxlgH6JQ17BU7H0XBz60OtTLufXo9CLInymaHkFmNrci6IhOonuyN/5z5QD7w/Mu+Gaai3VGQvx+GHsT7o1CM9cpf/LYF9oo9CEkeWXf+ZMSYtvUNdKBLpszKjvatLVmRXWYXI2nFBpCQcBvVzozzXOseRjACt61X1vSoMxO0HoEXcqqD84COHKED4+PTIPpFdpkVF5Emyjyu24QlTKrZArBLGXCt7V2FqlMaapB9FoxxY822scFNgl+XbMW1i+JWTYJUYATEr58xiogGPLjMdSKTsOJB+2SaPjO1wfiSFSQLfm1R/cqpwFtL5JvoO751E0pjxNhSGTmREsG5ko2z+EOMpTGo0HZKApaM3znqgeFLDRPZKEc1VgnqlNUb3oBruYAbtQKxFRqi+EY1ys+5qQHjOyWoBEyEoByjqKKOOQ/Gv7M6NHDDl6Cj5iqVNpy+ofyt1YCxsAUIa2RS3gbPvTL1Ps0fYbm2dhOV77hW8rT6jZUwB+dRCQobZXNwNqCA74P1nJrghUxt7itfe9+WeV6cfxa7V5SX43FxbLib/N4jT2T632Oe5yPGVMNrKNnmc5fVAjNlc8L8jLfKJRp1RXaecCKFBl8hrAARdlC+3ba7j82MBzRcz6r4em2dN7xJ6Ly+H+gOQ0Q5IHwI4PwauASMZAEZMU5ReV0j1NxbfGj7+t4jv46PlJW637n8dDaHxno4ixZnD/2+QRva5PfQIaoe2v/gKPUGHnchLY07iIBQWfQlu7y8iJIhAWfOBeI3IeHKPOetyoRtWuphBve8aTWQ4ODY74RZFUldsmI8zl5cEn553AQukfUrLjZgZBlZkLbA1BqPVmvA23hU9ttAcA/EvOnsau4O+8B7LtZXQL/nxG+hNCy2RlSAysqSFc3YnZpUkbKkiCnFL16kFIuDktCkm/VoteliBYQphZ/b4Onu7ZbSCYKKfYVnTV/igak6sUNDHK20LAeyfd3HNAwOjlfGFEGC8YrrXavo0xXa+235ycLbME8Uijqqc92Pw+E2P/uS37lnp4ts46cGdQ3yJYOFWIMMOsF7Iobb2/yz/vTTX54+H6Km2blCRWuDua3z0Mi9fG6tL1n+CRZdvVkMeF6MBxobD9/uNSMu6/2huIJlqGtl6mtupKYZ3dUAXVqw1xxlyRpoLG4z3nGlye9lMR7fqufGSli5I/HTnVDRX/c1Arz8/9Pnscsfme6kR7Z/DDn1MzG/4tTFvOOYa7XM+0bnB4OPmGrA31ncpKPYz5ZRpLDmlrsPAZCnGT9eGtTO1spbbtQKnO8/DF7kh0OfN73WjRpOnf72P+D/bcDT+avp/yTsNwzVu8P7dwAAAP//AQAA///l6eLetgwAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml
+echo "H4sIAAAAAAAA/+xWX48bNRB/z6ewiqq+9Hazd0eBVSsRcoWLuCshKQUJVcixJxsrXns7tvcuiA+Pxt4km9yFAn2ERErW88/z5zczK7QNcmzNUlXlgLGaG17B3FvkFYw1dw5cyTwGGAhrPFcGcBaMVzWUbEeRe6YkKyLa+6EFRCWhZH8MGGOsBXTKGvaKnQ8i4ddGh0oZ9z4d94TsibLZ3mRWYSOytsgEqic74b8n3qP3NP+xboYpaHdg5N+boQfx/sAUYx3zN79pgL1iRyZJI2vPnwyOtD7Jhcw2XlkqATv6zDfOQy3HFdrQsFcJA4xpW91AC7pkyiztYFfVkhXZZXYxkFasAQkEbq2aiXGea90hCIzATbyvAxwzQesBeCHHOjgP6EgRWjA+PvWsX2SXWXEREarM47x1WMBoOpkDtskDrrW9m6JqlYYKZLmNgRtrNrUNbhT8qmRLrl0kN2oUpAIjIN5+xsgiGvDgMteKTMKSB+2TaLpmbIPxJSuIFvzKovqdU4C3lnA/0nd840bkxoCxhTJyJCWCcyUbZvFLzUIdOEXbKglYMn7nKAeGLzSMZK0cxThNJU5eveE1uIYLuFFLEBuhIZJvVK38jJsKMJ7JQSVgJAT5GElTypjzYPw7q0MNN3wBOnKuUmj9xu/T31oNGAObg7BGJuZt8NwrU+3c/BkWK2vXkfmOayVPs99YCTNwHpUgs5E2A2cDCvgxWM8pCV7IlOYu8pX3TZnnxfkXMXtFeTkcFoeC26HTaeQJTJ89pnk+YEzVvIKSrb90WSUwUzanmp/xRrkEo7bIzlOdiKHBTxGWgAjbUr7dNNvLJsYDGq4n03i8ts4bXqfqvL7v8fZNRD4gfAjg/Aq4BIxgARlrnKzyqkKouLd4LPv63iO/jo/klbrfqvxyNoPaejiLEmfHet9RSye9Y4XIOpb/yZHrNTyuQlxqdxABYWrRl+zy8iJS+gCcOBcI31QJV+Y5b1QmbN1QDjO453WjgQh7xW4mTKYR1CUrhsPsxSXVL4+TwCWwfsPFGowsIwrSFBhb49FqDXgb99luGgjugZA3nlzN3H4eeM/F6grod0b4FkrDfGPEFFBZWbKiHrpTnSqSl2QxufjVi+RisWdSNWldPhptWpYBYUzmZzZ4WrnboXQCoGIX4VndhbhHqk7o0BBbKw3LHq18OMsJhsHB4cgYI0gwXnG9TRVdPUV7vyk/GngTZglCkUdxrrp22L8WPPua37lnp4Ns4lW9uHr+ksBcrEAGncp7wobbyXxafrruL0+vDxE35RUqGhvMpfW5o8+s9SXLP4KiqzfzHs6LYY9j4+LbHjPCst4tiitYhKpSprrmRmrq0W0M0KYBe81RlqyG2uIm4y1XmvReFsPhrXpurISlOyA/3RIV/btvEeDl50+fxyw/EN1SD2T/uuSUz4T8Kacs5i3HXKtF3iU63ws8QKoBf2dxnZZi11tGEcOaW+4+BECeevxwaFA6GytvuVFLcL67GLzI94s+rzuuG9ScMv39/4X/rxWe1l9F70nYTRiKd1vvPwEAAP//AQAA//9CyzWBMQ0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml
 
 echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml
 

diff --git a/...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
@@ -144,7 +144,7 @@ function download-release() {
 echo "== nodeup node config starting =="
 ensure-install-dir
 
-echo "H4sIAAAAAAAA/5xTTWvcMBC9+1cMgZBLKtvbNLQigZYsJYEmXTbHEorWmnXEyhpnJDld6I8v0n44m0Jpe7L13sybmTdSYynqK3JL08oCoFNOtXgfiFWLV1Z5j15C4IhFQy4o45Dn0QXToYQ9okdSJ5Um630dkNlolPCzAAAYkL0hB5cwKTLwrbexNc4/bI4jII4MiVFStNw3YqhFw+ZoH/x34S/wF5n/nCt4M7Q/EPl/mfTTPBxIAWzJ72HdI1zCK8mUIYbJUQFgqf2CA1oJxi2p2FsroRZn4m2hqVkhp034lelvnA/K2u0aV3GBM6Yf67woG31AvrqZziXUVSU+nItKVGVdJ7KPc3yK6EPmugLgkXxwqsNxtScf1bM/KQBMp1qUsHrvRduwMFSmSm/6XGqoxaQS1UHrk9yKxZAaUY7cuqPoP8XwKGGprMfUQssU+ymbAVmCX/uAnd7jc6IgocxzUNQzpsHoFKie/Tjc9O5+M9v5mahEXb1gqFPGyd1RWGqULQDQqYXFKS5i2xrXXiunLfLuHQDgYJpgyF0r1hI67IjXQg3K2JR3UVfVrTl1pHHpD+DjHWjS139mxIt3x6fZud9Cd+hB7J9XkPzcPL2ZSi6Wg+LSmkW5NbocA15tAsBheCZezfJ1vlP5eTuTCHK3yj9FZKVxvCjZzKrMdvakb5UzS/RhWxhDk4uxw4C+7LasL34BAAD//wEAAP///yjJ728EAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml
+echo "H4sIAAAAAAAA/6RUXWvbPBS+9684FEpv+sp23q5sooWNhNHC2oX0cpShWCeuiKzjHknuAvvxQ8pXk8HYh29sPef7OY/cWIp6TG5hWlkAdMqpFh8CsWpxbJX36CUEjlg05IIyDnkWXTAdStghem/UKUuT830ekNlolPC9AAAYkL0hB9cwKjLwpbexNc4/ro97QJwYEvuUouW+EUMtGjYnO+ffc3+Fv4r841jB66H9QZK/T5M+mseDVAAb49ew6hGu4ShlihDD6KQ4ivqnFgT1wVBaARw9DysfsNPjlin2cL3WAICl9hMOaCUYt6Bit1UJtbgQ/xeamiVyEoFfmv7W+aCs3ShoGec4Zfq2yhqx0Qfk8e1kJqGuKvHuUlSiKus6Gfs4w+eIPmRbVwA8kQ9OdbhX1dl79eLPCgDTqRYlLN960TYsDJWp0n99LjXUYlSJ6qD1UW7FYkiNKEdu1VH0H2J4krBQ1qdBmzz4hM2ALMGv2djhM6IgocxzUNRTpsHo5Khe/H64yf3DerbLC1GJunploU4ZJ7dHYalRtgBAp+YWJziPbWtce6OctsjbKwiAg2nSwm4UawkddsQroQZlbIq7qqvqzpw70rjwB/DpFjTp7T8y4tWb0/PM3E+uW/TA99crSHyub/1UJRbLQXFpzbzcEF3uHY42AeAwvBAvp1nG9yr/WZxJBnJ3yj9HZKVxL5RMZlVmOnvSd8qZBfqwKYyhycXYYUBfdhurL34AAAD//wEAAP//p4JRXeoEAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml
 
 echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml
 

diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml
@@ -155,6 +155,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
               [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
                 runtime_type = "io.containerd.runc.v2"
 
+                [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                  SystemdCgroup = true
+
           [plugins."io.containerd.grpc.v1.cri".registry]
 
             [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
@@ -508,6 +511,9 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
               [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
                 runtime_type = "io.containerd.runc.v2"
 
+                [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                  SystemdCgroup = true
+
           [plugins."io.containerd.grpc.v1.cri".registry]
 
             [plugins."io.containerd.grpc.v1.cri".registry.mirrors]

diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml
@@ -154,6 +154,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
 
               [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
                 runtime_type = "io.containerd.runc.v2"
+
+                [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                  SystemdCgroup = true
     logLevel: info
     version: 1.4.3
   docker:
@@ -489,6 +492,9 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
 
               [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
                 runtime_type = "io.containerd.runc.v2"
+
+                [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                  SystemdCgroup = true
     logLevel: info
     version: 1.4.3
   docker:

diff --git a/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...te_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/...te_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/...integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml
@@ -154,6 +154,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
 
               [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
                 runtime_type = "io.containerd.runc.v2"
+
+                [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                  SystemdCgroup = true
     logLevel: info
     version: 1.4.3
   docker:
@@ -489,6 +492,9 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
 
               [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
                 runtime_type = "io.containerd.runc.v2"
+
+                [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                  SystemdCgroup = true
     logLevel: info
     version: 1.4.3
   docker:

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...pdate_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/...pdate_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml
@@ -154,6 +154,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti
 
               [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
                 runtime_type = "io.containerd.runc.v2"
+
+                [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                  SystemdCgroup = true
     logLevel: info
     version: 1.4.3
   docker:
@@ -489,6 +492,9 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat
 
               [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
                 runtime_type = "io.containerd.runc.v2"
+
+                [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                  SystemdCgroup = true
     logLevel: info
     version: 1.4.3
   docker:

diff --git a/...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/...update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...er/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/...er/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...te_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...te_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
@@ -153,6 +153,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...le_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/...le_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
@@ -155,6 +155,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...le_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/...le_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script
@@ -155,6 +155,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...le_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/...le_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script
@@ -155,6 +155,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker:

diff --git a/...ce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/...ce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script
@@ -155,6 +155,9 @@ containerd:
 
             [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
               runtime_type = "io.containerd.runc.v2"
+
+              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+                SystemdCgroup = true
   logLevel: info
   version: 1.4.3
 docker: