use dockerd if requesting gpus

pkg/cloudprovider/aws/amifamily/al2.go

@@ -47,8 +47,9 @@ func (a AL2) SSMAlias(version string, instanceType cloudprovider.InstanceType) s
 // even if elements of those inputs are in differing orders,
 // guaranteeing it won't cause spurious hash differences.
 // AL2 userdata also works on Ubuntu
-func (a AL2) UserData(kubeletConfig *v1alpha5.KubeletConfiguration, taints []core.Taint, labels map[string]string, caBundle *string) bootstrap.Bootstrapper {
+func (a AL2) UserData(kubeletConfig *v1alpha5.KubeletConfiguration, taints []core.Taint, labels map[string]string, caBundle *string, instanceTypes []cloudprovider.InstanceType) bootstrap.Bootstrapper {
 	return bootstrap.EKS{
+		ContainerRuntime: a.containerRuntime(instanceTypes),
 		Options: bootstrap.Options{
 			ClusterName:             a.Options.ClusterName,
 			ClusterEndpoint:         a.Options.ClusterEndpoint,
@@ -61,6 +62,19 @@ func (a AL2) UserData(kubeletConfig *v1alpha5.KubeletConfiguration, taints []cor
 	}
 }
 
+// containerRuntime will return the proper container runtime based on the capabilities of the
+// instanceTypes passed in since the AL2 EKS Optimized AMI does not support GPUs w/ containerd.
+// this should be removed once the EKS Optimized AMI supports GPUs through containerd
+func (a AL2) containerRuntime(instanceTypes []cloudprovider.InstanceType) string {
+	instanceResources := instanceTypes[0].Resources()
+	if resources.IsZero(instanceResources[v1alpha1.ResourceNVIDIAGPU]) &&
+		resources.IsZero(instanceResources[v1alpha1.ResourceAMDGPU]) &&
+		resources.IsZero(instanceResources[v1alpha1.ResourceAWSNeuron]) {
+		return "containerd"
+	}
+	return "dockerd"
+}
+
 // DefaultBlockDeviceMappings returns the default block device mappings for the AMI Family
 func (a AL2) DefaultBlockDeviceMappings() []*v1alpha1.BlockDeviceMapping {
 	return []*v1alpha1.BlockDeviceMapping{{

pkg/cloudprovider/aws/amifamily/bootstrap/bootstrap.go

@@ -29,6 +29,7 @@ type Options struct {
 	Labels                  map[string]string `hash:"set"`
 	CABundle                *string
 	AWSENILimitedPodDensity bool
+	ContainerRuntime        *string
 }
 
 // Bootstrapper can be implemented to generate a bootstrap script

pkg/cloudprovider/aws/amifamily/bootstrap/eksbootstrap.go

@@ -26,6 +26,7 @@ import (
 
 type EKS struct {
 	Options
+	ContainerRuntime string
 }
 
 func (e EKS) Script() string {
@@ -45,6 +46,9 @@ func (e EKS) Script() string {
 		userData.WriteString(" \\\n--use-max-pods false")
 		kubeletExtraArgs += " --max-pods=110"
 	}
+	if e.ContainerRuntime != "" {
+		userData.WriteString(fmt.Sprintf(" \\\n--container-runtime %s", e.ContainerRuntime))
+	}
 	if kubeletExtraArgs = strings.Trim(kubeletExtraArgs, " "); len(kubeletExtraArgs) > 0 {
 		userData.WriteString(fmt.Sprintf(" \\\n--kubelet-extra-args '%s'", kubeletExtraArgs))
 	}

pkg/cloudprovider/aws/amifamily/bottlerocket.go

@@ -47,7 +47,7 @@ func (b Bottlerocket) SSMAlias(version string, instanceType cloudprovider.Instan
 }
 
 // UserData returns the default userdata script for the AMI Family
-func (b Bottlerocket) UserData(kubeletConfig *v1alpha5.KubeletConfiguration, taints []core.Taint, labels map[string]string, caBundle *string) bootstrap.Bootstrapper {
+func (b Bottlerocket) UserData(kubeletConfig *v1alpha5.KubeletConfiguration, taints []core.Taint, labels map[string]string, caBundle *string, _ []cloudprovider.InstanceType) bootstrap.Bootstrapper {
 	return bootstrap.Bottlerocket{
 		Options: bootstrap.Options{
 			ClusterName:             b.Options.ClusterName,

pkg/cloudprovider/aws/amifamily/resolver.go

@@ -67,7 +67,7 @@ type LaunchTemplate struct {
 
 // AMIFamily can be implemented to override the default logic for generating dynamic launch template parameters
 type AMIFamily interface {
-	UserData(kubeletConfig *v1alpha5.KubeletConfiguration, taints []core.Taint, labels map[string]string, caBundle *string) bootstrap.Bootstrapper
+	UserData(kubeletConfig *v1alpha5.KubeletConfiguration, taints []core.Taint, labels map[string]string, caBundle *string, instanceTypes []cloudprovider.InstanceType) bootstrap.Bootstrapper
 	SSMAlias(version string, instanceType cloudprovider.InstanceType) string
 	DefaultBlockDeviceMappings() []*v1alpha1.BlockDeviceMapping
 	DefaultMetadataOptions() *v1alpha1.MetadataOptions
@@ -99,7 +99,7 @@ func (r Resolver) Resolve(ctx context.Context, constraints *v1alpha1.Constraints
 	for amiID, instanceTypes := range amiIDs {
 		resolved := &LaunchTemplate{
 			Options:             options,
-			UserData:            amiFamily.UserData(constraints.KubeletConfiguration, constraints.Taints, options.Labels, options.CABundle),
+			UserData:            amiFamily.UserData(constraints.KubeletConfiguration, constraints.Taints, options.Labels, options.CABundle, instanceTypes),
 			BlockDeviceMappings: constraints.BlockDeviceMappings,
 			MetadataOptions:     constraints.MetadataOptions,
 			AMIID:               amiID,

pkg/cloudprovider/aws/amifamily/ubuntu.go

@@ -36,7 +36,7 @@ func (u Ubuntu) SSMAlias(version string, instanceType cloudprovider.InstanceType
 }
 
 // UserData returns the default userdata script for the AMI Family
-func (u Ubuntu) UserData(kubeletConfig *v1alpha5.KubeletConfiguration, taints []core.Taint, labels map[string]string, caBundle *string) bootstrap.Bootstrapper {
+func (u Ubuntu) UserData(kubeletConfig *v1alpha5.KubeletConfiguration, taints []core.Taint, labels map[string]string, caBundle *string, _ []cloudprovider.InstanceType) bootstrap.Bootstrapper {
 	return bootstrap.EKS{
 		Options: bootstrap.Options{
 			ClusterName:             u.Options.ClusterName,

pkg/cloudprovider/aws/instancetype.go

@@ -152,7 +152,7 @@ func (i *InstanceType) amdGPUs() resource.Quantity {
 	count := int64(0)
 	if i.GpuInfo != nil {
 		for _, gpu := range i.GpuInfo.Gpus {
-			if *gpu.Manufacturer == "NVIDIA" {
+			if *gpu.Manufacturer == "AMD" {
 				count += *gpu.Count
 			}
 		}

pkg/cloudprovider/aws/suite_test.go

@@ -590,6 +590,32 @@ var _ = Describe("Allocation", func() {
 				Expect(string(userData)).To(ContainSubstring("--use-max-pods false"))
 				Expect(string(userData)).To(ContainSubstring("--max-pods=110"))
 			})
+			It("should specify --container-runtime containerd by default", func() {
+				pod := ExpectProvisioned(ctx, env.Client, selectionController, provisioners, ProvisionerWithProvider(provisioner, provider), test.UnschedulablePod())[0]
+				ExpectScheduled(ctx, env.Client, pod)
+				Expect(fakeEC2API.CalledWithCreateLaunchTemplateInput.Cardinality()).To(Equal(1))
+				input := fakeEC2API.CalledWithCreateLaunchTemplateInput.Pop().(*ec2.CreateLaunchTemplateInput)
+				userData, _ := base64.StdEncoding.DecodeString(*input.LaunchTemplateData.UserData)
+				Expect(string(userData)).To(ContainSubstring("--container-runtime containerd"))
+			})
+			It("should specify --container-runtime dockerd when using GPUs", func() {
+				pod := ExpectProvisioned(ctx, env.Client, selectionController, provisioners, ProvisionerWithProvider(provisioner, provider), test.UnschedulablePod(test.PodOptions{
+					ResourceRequirements: v1.ResourceRequirements{
+						Requests: map[v1.ResourceName]resource.Quantity{
+							v1.ResourceCPU:             resource.MustParse("1"),
+							v1alpha1.ResourceNVIDIAGPU: resource.MustParse("1"),
+						},
+						Limits: map[v1.ResourceName]resource.Quantity{
+							v1alpha1.ResourceNVIDIAGPU: resource.MustParse("1"),
+						},
+					},
+				}))[0]
+				ExpectScheduled(ctx, env.Client, pod)
+				Expect(fakeEC2API.CalledWithCreateLaunchTemplateInput.Cardinality()).To(Equal(1))
+				input := fakeEC2API.CalledWithCreateLaunchTemplateInput.Pop().(*ec2.CreateLaunchTemplateInput)
+				userData, _ := base64.StdEncoding.DecodeString(*input.LaunchTemplateData.UserData)
+				Expect(string(userData)).To(ContainSubstring("--container-runtime dockerd"))
+			})
 			Context("Kubelet Args", func() {
 				It("should specify the --dns-cluster-ip flag when clusterDNSIP is set", func() {
 					provisioner.Spec.KubeletConfiguration = &v1alpha5.KubeletConfiguration{ClusterDNS: []string{"10.0.10.100"}}