Bug(bottlerocket) fix volume mount for non-efa use case (#516)

aws · Nov 28, 2024 · 1b11bd3 · 1b11bd3
1 parent a657451
commit 1b11bd3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/kubetest2/internal/deployers/eksapi/nodegroup.go b/kubetest2/internal/deployers/eksapi/nodegroup.go
@@ -172,6 +172,10 @@ func (m *NodegroupManager) createUnmanagedNodegroup(infra *Infrastructure, clust
 	if err != nil {
 		return err
 	}
+	volumeMountPath := "/dev/xvda"
+	if opts.UserDataFormat == "bottlerocket" {
+		volumeMountPath = "/dev/xvdb"
+	}
 	// pull the role name out of the ARN
 	nodeRoleArnParts := strings.Split(infra.nodeRole, "/")
 	nodeRoleName := nodeRoleArnParts[len(nodeRoleArnParts)-1]
@@ -228,6 +232,10 @@ func (m *NodegroupManager) createUnmanagedNodegroup(infra *Infrastructure, clust
 				ParameterKey:   aws.String("AMIId"),
 				ParameterValue: aws.String(opts.AMI),
 			},
+			{
+				ParameterKey:   aws.String("VolumeMountPath"),
+				ParameterValue: aws.String(volumeMountPath),
+			},
 		},
 	}
 	out, err := m.clients.CFN().CreateStack(context.TODO(), &input)

diff --git a/kubetest2/internal/deployers/eksapi/templates/unmanaged-nodegroup.yaml.template b/kubetest2/internal/deployers/eksapi/templates/unmanaged-nodegroup.yaml.template
@@ -45,6 +45,9 @@ Parameters:
   UserData:
     Type: String
 
+  VolumeMountPath:
+    Type: String
+
   UserDataIsMIMEPart:
     Description: "User data should be embedded as a part of a multi-part MIME document"
     Default: true
@@ -130,7 +133,7 @@ Resources:
         ImageId: !Ref AMIId
         InstanceType: "{{index .InstanceTypes 0}}"
         BlockDeviceMappings:
-          - DeviceName: /dev/xvda
+          - DeviceName: !Ref VolumeMountPath
             Ebs:
               VolumeSize: !Ref NodeDiskSize
               VolumeType: gp2