Merge pull request #99 from jwcesign/fix-flannel

fix: report error if image not found
cloudpilot-ai · Nov 7, 2024 · 449c836 · 449c836
2 parents ff05685 + 2e5631c
commit 449c836
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/pkg/providers/instance/instance.go b/pkg/providers/instance/instance.go
@@ -462,6 +462,11 @@ func (p *DefaultProvider) getProvisioningGroup(ctx context.Context, nodeClass *v
 		systemDisk = imagefamily.DefaultSystemDisk.DeepCopy()
 	}
 
+	imageID, ok := mappedImages[instanceTypes[0].Name]
+	if !ok {
+		return nil, errors.New("matching image not found")
+	}
+
 	createAutoProvisioningGroupRequest := &ecsclient.CreateAutoProvisioningGroupRequest{
 		RegionId:                        tea.String(p.region),
 		TotalTargetCapacity:             tea.String("1"),
@@ -472,7 +477,7 @@ func (p *DefaultProvider) getProvisioningGroup(ctx context.Context, nodeClass *v
 		AutoProvisioningGroupType:       tea.String("instant"),
 		LaunchConfiguration: &ecsclient.CreateAutoProvisioningGroupRequestLaunchConfiguration{
 			// TODO: we should set image id for each instance types after alibabacloud supports
-			ImageId:          tea.String(mappedImages[instanceTypes[0].Name]),
+			ImageId:          tea.String(imageID),
 			SecurityGroupIds: securityGroupIDs,
 			UserData:         tea.String(userData),
 

diff --git a/pkg/providers/instancetype/types.go b/pkg/providers/instancetype/types.go
@@ -47,7 +47,8 @@ const (
 	MemoryAvailable = "memory.available"
 	NodeFSAvailable = "nodefs.available"
 
-	GiBMiBRatio              = 1024 * 1024
+	GiBMiBRatio              = 1024
+	MiBByteRatio             = 1024 * 1024
 	TerwayMinENIRequirements = 11
 	BaseHostNetworkPods      = 3
 	FlannelDefaultPods       = 256
@@ -116,7 +117,7 @@ func computeRequirements(info *ecsclient.DescribeInstanceTypesResponseBodyInstan
 		// Well Known to AlibabaCloud
 		scheduling.NewRequirement(v1alpha1.LabelInstanceCPU, corev1.NodeSelectorOpIn, fmt.Sprint(*info.CpuCoreCount)),
 		scheduling.NewRequirement(v1alpha1.LabelInstanceCPUModel, corev1.NodeSelectorOpDoesNotExist),
-		scheduling.NewRequirement(v1alpha1.LabelInstanceMemory, corev1.NodeSelectorOpIn, fmt.Sprint(*info.MemorySize)),
+		scheduling.NewRequirement(v1alpha1.LabelInstanceMemory, corev1.NodeSelectorOpIn, fmt.Sprint(*info.MemorySize*GiBMiBRatio)),
 		scheduling.NewRequirement(v1alpha1.LabelInstanceCategory, corev1.NodeSelectorOpDoesNotExist),
 		scheduling.NewRequirement(v1alpha1.LabelInstanceFamily, corev1.NodeSelectorOpDoesNotExist),
 		scheduling.NewRequirement(v1alpha1.LabelInstanceGeneration, corev1.NodeSelectorOpDoesNotExist),
@@ -272,7 +273,7 @@ func memory(ctx context.Context, info *ecsclient.DescribeInstanceTypesResponseBo
 		return mem
 	}
 	// Account for VM overhead in calculation
-	mem.Sub(resource.MustParse(fmt.Sprintf("%dMi", int64(math.Ceil(float64(mem.Value())*options.FromContext(ctx).VMMemoryOverheadPercent/GiBMiBRatio)))))
+	mem.Sub(resource.MustParse(fmt.Sprintf("%dMi", int64(math.Ceil(float64(mem.Value())*options.FromContext(ctx).VMMemoryOverheadPercent/MiBByteRatio)))))
 	return mem
 }