update

Author: daimaxiaxie

pkg/apis/v1alpha1/ecsnodeclass.go

@@ -304,26 +304,13 @@ const (
 func (in *ECSNodeClass) Hash() string {
 	return fmt.Sprint(lo.Must(hashstructure.Hash([]interface{}{
 		in.Spec,
-		in.ImageFamily(),
 	}, hashstructure.FormatV2, &hashstructure.HashOptions{
 		SlicesAsSets:    true,
 		IgnoreZeroValue: true,
 		ZeroNil:         true,
 	})))
 }
 
-// ImageFamily returns the family for a NodePool based on the following items, in order of precdence:
-//   - ecsnodeclass.spec.imageFamily
-//   - ecsnodeclass.spec.imageSelectorTerms[].alias
-//
-// If an alias is specified, ecsnodeclass.spec.imageFamily must match that alias, or be 'Custom' (enforced via validation).
-func (in *ECSNodeClass) ImageFamily() string {
-	if alias := in.Alias(); alias != nil {
-		return alias.Family
-	}
-	return ImageFamilyCustom
-}
-
 func (in *ECSNodeClass) Alias() *Alias {
 	term, ok := lo.Find(in.Spec.ImageSelectorTerms, func(term ImageSelectorTerm) bool {
 		return term.Alias != ""

pkg/providers/cluster/ackmanaged.go

@@ -130,9 +130,9 @@ func (a *ACKManaged) GetSupportedImages(k8sVersion string) ([]Image, error) {
 			ImageID:      tea.StringValue(item.ImageId),
 			ImageName:    tea.StringValue(item.ImageName),
 			Platform:     tea.StringValue(item.Platform),
-			OsVersion:    tea.StringValue(item.OsVersion),
+			OSVersion:    tea.StringValue(item.OsVersion),
 			ImageType:    tea.StringValue(item.ImageType),
-			OsType:       tea.StringValue(item.OsType),
+			OSType:       tea.StringValue(item.OsType),
 			Architecture: tea.StringValue(item.Architecture),
 		}
 	}), nil

pkg/providers/cluster/types.go

@@ -44,9 +44,9 @@ type Image struct {
 	ImageID      string
 	ImageName    string
 	Platform     string
-	OsVersion    string
+	OSVersion    string
 	ImageType    string
-	OsType       string
+	OSType       string
 	Architecture string
 }
 

pkg/providers/imagefamily/image.go

@@ -101,7 +101,7 @@ func (p *DefaultProvider) getImages(ctx context.Context, nodeClass *v1alpha1.ECS
 		var err error
 		if selectorTerm.Alias != "" {
 			alias := v1alpha1.NewAlias(selectorTerm.Alias)
-			imageFamily := GetImageFamily(selectorTerm.Alias, nil)
+			imageFamily := GetImageFamily(alias.Family, nil)
 			if imageFamily == nil {
 				return nil, fmt.Errorf("unsupported image family %s", selectorTerm.Alias)
 			}