Add AWSManagedPoolTemplate

Signed-off-by: Dinar Valeev <k0da@opensuse.org>

Author: k0da

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepooltemplates.yaml

@@ -21,13 +21,14 @@ import (
 	"fmt"
 	"reflect"
 
+	"k8s.io/utils/ptr"
+
 	"github.com/google/go-cmp/cmp"
 	"github.com/pkg/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/klog/v2"
-	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
@@ -60,7 +61,7 @@ type awsManagedMachinePoolWebhook struct{}
 var _ webhook.CustomDefaulter = &awsManagedMachinePoolWebhook{}
 var _ webhook.CustomValidator = &awsManagedMachinePoolWebhook{}
 
-func (r *AWSManagedMachinePool) validateScaling() field.ErrorList {
+func validateScaling(r *AWSManagedMachinePool) field.ErrorList {
 	var allErrs field.ErrorList
 	if r.Spec.Scaling != nil { //nolint:nestif
 		minField := field.NewPath("spec", "scaling", "minSize")
@@ -85,7 +86,7 @@ func (r *AWSManagedMachinePool) validateScaling() field.ErrorList {
 	return allErrs
 }
 
-func (r *AWSManagedMachinePool) validateNodegroupUpdateConfig() field.ErrorList {
+func validateNodegroupUpdateConfig(r *AWSManagedMachinePool) field.ErrorList {
 	var allErrs field.ErrorList
 
 	if r.Spec.UpdateConfig != nil {
@@ -106,7 +107,7 @@ func (r *AWSManagedMachinePool) validateNodegroupUpdateConfig() field.ErrorList
 	return allErrs
 }
 
-func (r *AWSManagedMachinePool) validateRemoteAccess() field.ErrorList {
+func validateRemoteAccess(r *AWSManagedMachinePool) field.ErrorList {
 	var allErrs field.ErrorList
 	if r.Spec.RemoteAccess == nil {
 		return allErrs
@@ -124,7 +125,7 @@ func (r *AWSManagedMachinePool) validateRemoteAccess() field.ErrorList {
 	return allErrs
 }
 
-func (r *AWSManagedMachinePool) validateLaunchTemplate() field.ErrorList {
+func validateLaunchTemplate(r *AWSManagedMachinePool) field.ErrorList {
 	var allErrs field.ErrorList
 	if r.Spec.AWSLaunchTemplate == nil {
 		return allErrs
@@ -162,16 +163,16 @@ func (*awsManagedMachinePoolWebhook) ValidateCreate(_ context.Context, obj runti
 	if r.Spec.EKSNodegroupName == "" {
 		allErrs = append(allErrs, field.Required(field.NewPath("spec.eksNodegroupName"), "eksNodegroupName is required"))
 	}
-	if errs := r.validateScaling(); errs != nil || len(errs) == 0 {
+	if errs := validateScaling(r); errs != nil || len(errs) == 0 {
 		allErrs = append(allErrs, errs...)
 	}
-	if errs := r.validateRemoteAccess(); len(errs) > 0 {
+	if errs := validateRemoteAccess(r); len(errs) > 0 {
 		allErrs = append(allErrs, errs...)
 	}
-	if errs := r.validateNodegroupUpdateConfig(); len(errs) > 0 {
+	if errs := validateNodegroupUpdateConfig(r); len(errs) > 0 {
 		allErrs = append(allErrs, errs...)
 	}
-	if errs := r.validateLaunchTemplate(); len(errs) > 0 {
+	if errs := validateLaunchTemplate(r); len(errs) > 0 {
 		allErrs = append(allErrs, errs...)
 	}
 	if errs := r.validateLifecycleHooks(); len(errs) > 0 {
@@ -207,16 +208,16 @@ func (*awsManagedMachinePoolWebhook) ValidateUpdate(_ context.Context, oldObj, n
 	}
 
 	var allErrs field.ErrorList
-	allErrs = append(allErrs, r.validateImmutable(oldPool)...)
+	allErrs = append(allErrs, validateAMPImmutable(oldPool, r)...)
 	allErrs = append(allErrs, r.Spec.AdditionalTags.Validate()...)
 
-	if errs := r.validateScaling(); errs != nil || len(errs) == 0 {
+	if errs := validateScaling(r); errs != nil || len(errs) == 0 {
 		allErrs = append(allErrs, errs...)
 	}
-	if errs := r.validateNodegroupUpdateConfig(); len(errs) > 0 {
+	if errs := validateNodegroupUpdateConfig(r); len(errs) > 0 {
 		allErrs = append(allErrs, errs...)
 	}
-	if errs := r.validateLaunchTemplate(); len(errs) > 0 {
+	if errs := validateLaunchTemplate(r); len(errs) > 0 {
 		allErrs = append(allErrs, errs...)
 	}
 	if errs := r.validateLifecycleHooks(); len(errs) > 0 {
@@ -239,7 +240,7 @@ func (*awsManagedMachinePoolWebhook) ValidateDelete(_ context.Context, _ runtime
 	return nil, nil
 }
 
-func (r *AWSManagedMachinePool) validateImmutable(old *AWSManagedMachinePool) field.ErrorList {
+func validateAMPImmutable(old *AWSManagedMachinePool, current *AWSManagedMachinePool) field.ErrorList {
 	var allErrs field.ErrorList
 
 	appendErrorIfMutated := func(old, update interface{}, name string) {
@@ -260,25 +261,25 @@ func (r *AWSManagedMachinePool) validateImmutable(old *AWSManagedMachinePool) fi
 	}
 
 	if old.Spec.EKSNodegroupName != "" {
-		appendErrorIfMutated(old.Spec.EKSNodegroupName, r.Spec.EKSNodegroupName, "eksNodegroupName")
-	}
-	appendErrorIfMutated(old.Spec.SubnetIDs, r.Spec.SubnetIDs, "subnetIDs")
-	appendErrorIfSetAndMutated(old.Spec.RoleName, r.Spec.RoleName, "roleName")
-	appendErrorIfMutated(old.Spec.DiskSize, r.Spec.DiskSize, "diskSize")
-	appendErrorIfMutated(old.Spec.AMIType, r.Spec.AMIType, "amiType")
-	appendErrorIfMutated(old.Spec.RemoteAccess, r.Spec.RemoteAccess, "remoteAccess")
-	appendErrorIfSetAndMutated(old.Spec.CapacityType, r.Spec.CapacityType, "capacityType")
-	appendErrorIfMutated(old.Spec.AvailabilityZones, r.Spec.AvailabilityZones, "availabilityZones")
-	appendErrorIfMutated(old.Spec.AvailabilityZoneSubnetType, r.Spec.AvailabilityZoneSubnetType, "availabilityZoneSubnetType")
-	if (old.Spec.AWSLaunchTemplate != nil && r.Spec.AWSLaunchTemplate == nil) ||
-		(old.Spec.AWSLaunchTemplate == nil && r.Spec.AWSLaunchTemplate != nil) {
+		appendErrorIfMutated(old.Spec.EKSNodegroupName, current.Spec.EKSNodegroupName, "eksNodegroupName")
+	}
+	appendErrorIfMutated(old.Spec.SubnetIDs, current.Spec.SubnetIDs, "subnetIDs")
+	appendErrorIfSetAndMutated(old.Spec.RoleName, current.Spec.RoleName, "roleName")
+	appendErrorIfMutated(old.Spec.DiskSize, current.Spec.DiskSize, "diskSize")
+	appendErrorIfMutated(old.Spec.AMIType, current.Spec.AMIType, "amiType")
+	appendErrorIfMutated(old.Spec.RemoteAccess, current.Spec.RemoteAccess, "remoteAccess")
+	appendErrorIfSetAndMutated(old.Spec.CapacityType, current.Spec.CapacityType, "capacityType")
+	appendErrorIfMutated(old.Spec.AvailabilityZones, current.Spec.AvailabilityZones, "availabilityZones")
+	appendErrorIfMutated(old.Spec.AvailabilityZoneSubnetType, current.Spec.AvailabilityZoneSubnetType, "availabilityZoneSubnetType")
+	if (old.Spec.AWSLaunchTemplate != nil && current.Spec.AWSLaunchTemplate == nil) ||
+		(old.Spec.AWSLaunchTemplate == nil && current.Spec.AWSLaunchTemplate != nil) {
 		allErrs = append(
 			allErrs,
 			field.Invalid(field.NewPath("spec", "AWSLaunchTemplate"), old.Spec.AWSLaunchTemplate, "field is immutable"),
 		)
 	}
-	if old.Spec.AWSLaunchTemplate != nil && r.Spec.AWSLaunchTemplate != nil {
-		appendErrorIfMutated(old.Spec.AWSLaunchTemplate.Name, r.Spec.AWSLaunchTemplate.Name, "awsLaunchTemplate.name")
+	if old.Spec.AWSLaunchTemplate != nil && current.Spec.AWSLaunchTemplate != nil {
+		appendErrorIfMutated(old.Spec.AWSLaunchTemplate.Name, current.Spec.AWSLaunchTemplate.Name, "awsLaunchTemplate.name")
 	}
 
 	return allErrs
@@ -306,9 +307,13 @@ func (*awsManagedMachinePoolWebhook) Default(_ context.Context, obj runtime.Obje
 	}
 
 	if r.Spec.UpdateConfig == nil {
-		r.Spec.UpdateConfig = &UpdateConfig{
-			MaxUnavailable: ptr.To[int](1),
-		}
+		r.Spec.UpdateConfig = defaultManagedMachinePoolUpdateConfig()
 	}
 	return nil
 }
+
+func defaultManagedMachinePoolUpdateConfig() *UpdateConfig {
+	return &UpdateConfig{
+		MaxUnavailable: ptr.To[int](1),
+	}
+}

exp/api/v1beta2/awsmanagedmachinepool_webhook.go

@@ -0,0 +1,55 @@
+/*
+Copyright 2021 The Kubernetes 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 v1beta2
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +kubebuilder:object:root=true
+// +kubebuilder:storageversion
+// +kubebuilder:resource:path=awsmanagedmachinepooltemplates,scope=Namespaced,categories=cluster-api,shortName=awsmmpt
+
+// AWSManagedMachinePoolTemplate is the Schema for the awsmanagedmachinepooltemplates API.
+type AWSManagedMachinePoolTemplate struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec AWSManagedMachinePoolTemplateSpec `json:"spec,omitempty"`
+}
+
+//type AWSManagedMachinePoolTemplateResource struct {
+//	Spec AWSManagedMachinePoolSpec `json:"spec"`
+//}
+
+// AWSManagedMachinePoolTemplateSpec defines the desired state of AWSManagedMachinePoolTemplate.
+type AWSManagedMachinePoolTemplateSpec struct {
+	Template *AWSManagedMachinePool `json:"template"`
+}
+
+// +kubebuilder:object:root=true
+
+// AWSManagedMachinePoolTemplateList contains a list of AWSManagedMachinePoolTemplates.
+type AWSManagedMachinePoolTemplateList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []AWSManagedMachinePoolTemplate `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&AWSManagedMachinePoolTemplate{}, &AWSManagedMachinePoolTemplateList{})
+}

exp/api/v1beta2/awsmanagedmachinepooltemplate_types.go

@@ -0,0 +1,146 @@
+/*
+Copyright 2022 The Kubernetes 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 v1beta2
+
+import (
+	"context"
+	"fmt"
+	"github.com/pkg/errors"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/validation/field"
+	"k8s.io/klog/v2"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+)
+
+// SetupWebhookWithManager will setup the webhooks for the AWSManagedMachinePool.
+func (rt *AWSManagedMachinePoolTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	w := new(awsManagedMachinePoolTemplateWebhook)
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(rt).
+		WithValidator(w).
+		WithDefaulter(w).
+		Complete()
+}
+
+// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-awsmanagedmachinepooltemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=awsmanagedmachinepooltemplates,versions=v1beta2,name=validation.awsmanagedmachinepooltemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
+// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-awsmanagedmachinepooltemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=awsmanagedmachinepooltemplates,versions=v1beta2,name=default.awsmanagedmachinepooltemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
+type awsManagedMachinePoolTemplateWebhook struct{}
+
+var _ webhook.CustomDefaulter = &awsManagedMachinePoolTemplateWebhook{}
+var _ webhook.CustomValidator = &awsManagedMachinePoolTemplateWebhook{}
+
+// ValidateCreate will do any extra validation when creating a AWSManagedMachinePoolTemplate.
+func (*awsManagedMachinePoolTemplateWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
+	r, ok := obj.(*AWSManagedMachinePoolTemplate)
+	if !ok {
+		return nil, fmt.Errorf("expected an AWSManagedMachinePoolTemplate object but got %T", r)
+	}
+	mmpLog.Info("AWSManagedMachinePoolTemplate validate create", "managed-machine-pool", klog.KObj(r))
+
+	var allErrs field.ErrorList
+
+	if errs := validateScaling(r.Spec.Template); errs != nil || len(errs) == 0 {
+		allErrs = append(allErrs, errs...)
+	}
+
+	if errs := validateRemoteAccess(r.Spec.Template); len(errs) > 0 {
+		allErrs = append(allErrs, errs...)
+	}
+
+	if errs := validateNodegroupUpdateConfig(r.Spec.Template); len(errs) > 0 {
+		allErrs = append(allErrs, errs...)
+	}
+
+	if errs := validateLaunchTemplate(r.Spec.Template); len(errs) > 0 {
+		allErrs = append(allErrs, errs...)
+	}
+
+	allErrs = append(allErrs, r.Spec.Template.Spec.AdditionalTags.Validate()...)
+
+	if len(allErrs) == 0 {
+		return nil, nil
+	}
+
+	return nil, apierrors.NewInvalid(
+		r.GroupVersionKind().GroupKind(),
+		r.Name,
+		allErrs,
+	)
+}
+
+// ValidateUpdate will do any extra validation when creating a AWSManagedMachinePoolTemplate.
+func (*awsManagedMachinePoolTemplateWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+	r, ok := newObj.(*AWSManagedMachinePoolTemplate)
+	if !ok {
+		return nil, fmt.Errorf("expected an AWSManagedMachinePoolTemplate object but got %T", r)
+	}
+
+	mmpLog.Info("AWSManagedMachinePoolTemplate validate update", "managed-machine-pool", klog.KObj(r))
+
+	mmpLog.Info("AWSManagedMachinePool validate update", "managed-machine-pool", klog.KObj(r))
+	oldPool, ok := oldObj.(*AWSManagedMachinePoolTemplate)
+	if !ok {
+		return nil, apierrors.NewInvalid(GroupVersion.WithKind("AWSManagedMachinePool").GroupKind(), r.Name, field.ErrorList{
+			field.InternalError(nil, errors.New("failed to convert old AWSManagedMachinePool to object")),
+		})
+	}
+
+	var allErrs field.ErrorList
+	allErrs = append(allErrs, validateAMPImmutable(oldPool.Spec.Template, r.Spec.Template)...)
+	allErrs = append(allErrs, r.Spec.Template.Spec.AdditionalTags.Validate()...)
+
+	if errs := validateScaling(r.Spec.Template); errs != nil || len(errs) == 0 {
+		allErrs = append(allErrs, errs...)
+	}
+	if errs := validateNodegroupUpdateConfig(r.Spec.Template); len(errs) > 0 {
+		allErrs = append(allErrs, errs...)
+	}
+	if errs := validateLaunchTemplate(r.Spec.Template); len(errs) > 0 {
+		allErrs = append(allErrs, errs...)
+	}
+
+	if len(allErrs) == 0 {
+		return nil, nil
+	}
+
+	return nil, apierrors.NewInvalid(
+		r.GroupVersionKind().GroupKind(),
+		r.Name,
+		allErrs,
+	)
+}
+
+// ValidateDelete will do any extra validation when creating a AWSManagedMachinePoolTemplate.
+func (*awsManagedMachinePoolTemplateWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
+	return nil, nil
+}
+
+// Default will set default values for the AWSManagedMachinePool.
+func (*awsManagedMachinePoolTemplateWebhook) Default(_ context.Context, obj runtime.Object) error {
+	r, ok := obj.(*AWSManagedMachinePoolTemplate)
+	if !ok {
+		return fmt.Errorf("expected an AWSManagedMachinePoolTemplate object but got %T", r)
+	}
+	if r.Spec.Template.Spec.UpdateConfig == nil {
+		r.Spec.Template.Spec.UpdateConfig = defaultManagedMachinePoolUpdateConfig()
+	}
+	return nil
+}