Merge pull request #54 from jwcesign/main

fix: fix some bugs of node creation

Author: helen

cmd/controller/main.go

@@ -62,6 +62,7 @@ func main() {
 			op.VSwitchProvider,
 			op.SecurityGroupProvider,
 			op.LaunchTemplateProvider,
+			op.ImageProvider,
 		)...).
 		Start(ctx, cloudProvider)
 }

pkg/apis/v1alpha1/ecsnodeclass_status.go

@@ -25,6 +25,7 @@ const (
 	ConditionTypeVSwitchesReady      = "VSwitchesReady"
 	ConditionTypeSecurityGroupsReady = "SecurityGroupsReady"
 	ConditionTypeInstanceRAMReady    = "InstanceRAMReady"
+	ConditionTypeImagesReady         = "ImagesReady"
 )
 
 // VSwitch contains resolved VSwitch selector values utilized for node launch
@@ -84,6 +85,7 @@ func (in *ECSNodeClass) StatusConditions() status.ConditionSet {
 		ConditionTypeVSwitchesReady,
 		ConditionTypeSecurityGroupsReady,
 		ConditionTypeInstanceRAMReady,
+		ConditionTypeImagesReady,
 	).For(in)
 }
 

pkg/controllers/controllers.go

@@ -33,6 +33,7 @@ import (
 	nodeclasstermination "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/nodeclass/termination"
 	providersinstancetype "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/providers/instancetype"
 	controllerspricing "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/providers/pricing"
+	"github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/imagefamily"
 	"github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instance"
 	"github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instancetype"
 	"github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/launchtemplate"
@@ -47,11 +48,11 @@ func NewControllers(ctx context.Context, mgr manager.Manager, clk clock.Clock,
 	instanceProvider instance.Provider, instanceTypeProvider instancetype.Provider,
 	pricingProvider pricing.Provider,
 	vSwitchProvider vswitch.Provider, securitygroupProvider securitygroup.Provider,
-	launchTemplateProvider launchtemplate.Provider) []controller.Controller {
+	launchTemplateProvider launchtemplate.Provider, imageProvider imagefamily.Provider) []controller.Controller {
 
 	controllers := []controller.Controller{
 		nodeclasshash.NewController(kubeClient),
-		nodeclaasstatus.NewController(kubeClient, vSwitchProvider, securitygroupProvider),
+		nodeclaasstatus.NewController(kubeClient, vSwitchProvider, securitygroupProvider, imageProvider),
 		nodeclasstermination.NewController(kubeClient, recorder, launchTemplateProvider),
 		controllerspricing.NewController(pricingProvider),
 		nodeclaimgarbagecollection.NewController(kubeClient, cloudProvider),

pkg/controllers/nodeclass/status/controller.go

@@ -33,6 +33,7 @@ import (
 	"sigs.k8s.io/karpenter/pkg/utils/result"
 
 	"github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1"
+	"github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/imagefamily"
 	"github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/securitygroup"
 	"github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/vswitch"
 )
@@ -46,14 +47,17 @@ type Controller struct {
 
 	vSwitch       *VSwitch
 	securitygroup *SecurityGroup
+	image         *Image
 }
 
-func NewController(kubeClient client.Client, vSwitchProvider vswitch.Provider, securitygroupProvider securitygroup.Provider) *Controller {
+func NewController(kubeClient client.Client, vSwitchProvider vswitch.Provider,
+	securitygroupProvider securitygroup.Provider, imageProvider imagefamily.Provider) *Controller {
 	return &Controller{
 		kubeClient: kubeClient,
 
 		vSwitch:       &VSwitch{vSwitchProvider: vSwitchProvider},
 		securitygroup: &SecurityGroup{securityGroupProvider: securitygroupProvider},
+		image:         &Image{imageProvider: imageProvider},
 	}
 }
 
@@ -84,6 +88,7 @@ func (c *Controller) Reconcile(ctx context.Context, nodeClass *v1alpha1.ECSNodeC
 	for _, reconciler := range []nodeClassStatusReconciler{
 		c.vSwitch,
 		c.securitygroup,
+		c.image,
 	} {
 		res, err := reconciler.Reconcile(ctx, nodeClass)
 		errs = multierr.Append(errs, err)

pkg/controllers/nodeclass/status/image.go

@@ -0,0 +1,70 @@
+/*
+Copyright 2024 The CloudPilot AI Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package status
+
+import (
+	"context"
+	"sort"
+	"time"
+
+	"github.com/samber/lo"
+	corev1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1"
+
+	"github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1"
+	"github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/imagefamily"
+)
+
+type Image struct {
+	imageProvider imagefamily.Provider
+}
+
+func (i *Image) Reconcile(ctx context.Context, nodeClass *v1alpha1.ECSNodeClass) (reconcile.Result, error) {
+	images, err := i.imageProvider.List(ctx, nodeClass)
+	if err != nil {
+		log.FromContext(ctx).Error(err, "failed to list images")
+		return reconcile.Result{}, err
+	}
+
+	if len(images) == 0 {
+		nodeClass.Status.Images = nil
+		nodeClass.StatusConditions().SetFalse(v1alpha1.ConditionTypeImagesReady, "ImagesNotFound", "ImageSelector did not match any Images")
+		return reconcile.Result{}, nil
+	}
+
+	nodeClass.Status.Images = lo.Map(images, func(image imagefamily.Image, _ int) v1alpha1.Image {
+		reqs := lo.Map(image.Requirements.NodeSelectorRequirements(), func(item karpv1.NodeSelectorRequirementWithMinValues, _ int) corev1.NodeSelectorRequirement {
+			return item.NodeSelectorRequirement
+		})
+
+		sort.Slice(reqs, func(i, j int) bool {
+			if len(reqs[i].Key) != len(reqs[j].Key) {
+				return len(reqs[i].Key) < len(reqs[j].Key)
+			}
+			return reqs[i].Key < reqs[j].Key
+		})
+		return v1alpha1.Image{
+			Name:         image.Name,
+			ID:           image.ImageID,
+			Requirements: reqs,
+		}
+	})
+	nodeClass.StatusConditions().SetTrue(v1alpha1.ConditionTypeImagesReady)
+	return reconcile.Result{RequeueAfter: 5 * time.Minute}, nil
+}

pkg/providers/instance/instance.go

@@ -135,6 +135,7 @@ func (p *DefaultProvider) List(ctx context.Context) ([]*Instance, error) {
 				Value: tea.String(options.FromContext(ctx).ClusterName),
 			},
 		},
+		RegionId: p.ecsClient.RegionId,
 	}
 
 	runtime := &util.RuntimeOptions{}