feat: add support for container runtime on windows AMIs (#359)

* feat: add support for container runtime on windows AMIs

Signed-off-by: Jonah Back <[email protected]>

* chore: update docs to reflect Windows support for containerRuntime

Signed-off-by: Jonah Back <[email protected]>

Author: backjo

controllers/provisioners/eks/helpers.go

@@ -553,6 +553,9 @@ func (ctx *EksInstanceGroupContext) GetBootstrapArgs() string {
 			sb.WriteString(fmt.Sprintf("-Base64ClusterCA %v ", aws.StringValue(state.Cluster.CertificateAuthority.Data)))
 			sb.WriteString(fmt.Sprintf("-APIServerEndpoint %v ", aws.StringValue(state.Cluster.Endpoint)))
 		}
+		if bootstrapOptions != nil && bootstrapOptions.ContainerRuntime != "" {
+			sb.WriteString(fmt.Sprintf("-ContainerRuntime %v ", bootstrapOptions.ContainerRuntime))
+		}
 		sb.WriteString(fmt.Sprintf("-KubeletExtraArgs '%v'", ctx.GetKubeletExtraArgs()))
 	case OsFamilyAmazonLinux2:
 		if bootstrapOptions != nil && bootstrapOptions.MaxPods > 0 {

controllers/provisioners/eks/helpers_test.go

@@ -190,6 +190,7 @@ func TestGetBasicUserDataWindows(t *testing.T) {
 
 	configuration.BootstrapOptions = &v1alpha1.BootstrapOptions{
 		MaxPods: 4,
+		ContainerRuntime: "containerd",
 	}
 	configuration.Labels = map[string]string{
 		"foo": "bar",
@@ -229,7 +230,7 @@ func TestGetBasicUserDataWindows(t *testing.T) {
     Echo "Not starting Kubelet due to warmed state."
     & C:\ProgramData\Amazon\EC2-Windows\Launch\Scripts\InitializeInstance.ps1 –Schedule
   } else {
-    & $EKSBootstrapScriptFile -EKSClusterName foo -Base64ClusterCA dGVzdA== -APIServerEndpoint foo.amazonaws.com -KubeletExtraArgs '--node-labels=foo=bar,instancemgr.keikoproj.io/image=ami-123456789012,node.kubernetes.io/role=instance-group-1 --register-with-taints=foo=bar:NoSchedule --eviction-hard=memory.available<300Mi,nodefs.available<5% --system-reserved=memory=2.5Gi --v=2 --max-pods=4' 3>&1 4>&1 5>&1 6>&1
+    & $EKSBootstrapScriptFile -EKSClusterName foo -Base64ClusterCA dGVzdA== -APIServerEndpoint foo.amazonaws.com -ContainerRuntime containerd -KubeletExtraArgs '--node-labels=foo=bar,instancemgr.keikoproj.io/image=ami-123456789012,node.kubernetes.io/role=instance-group-1 --register-with-taints=foo=bar:NoSchedule --eviction-hard=memory.available<300Mi,nodefs.available<5% --system-reserved=memory=2.5Gi --v=2 --max-pods=4' 3>&1 4>&1 5>&1 6>&1
     bar
   }
 </powershell>`

docs/EKS.md

@@ -59,7 +59,7 @@ spec:
       suspendProcesses: <[]string> : must match scaling process names to suspend
 
       bootstrapOptions:
-        containerRuntime: <string> : one of "dockerd" or "containerd". Specifies which container runtime to use. Currently only available on Amazon Linux 2
+        containerRuntime: <string> : one of "dockerd" or "containerd". Specifies which container runtime to use. Available for Amazon Linux 2 and Windows.
         maxPods: <int> : maximum number of pods that can be run per-node in this IG.