fix: set defaults for AWS CP and Worker instanceType

Author: supershal

api/v1alpha1/aws_node_types.go

@@ -4,15 +4,16 @@
 package v1alpha1
 
 import (
-	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/variables"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+
+	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/variables"
 )
 
 const (
 	AWSControlPlaneInstanceType InstanceType = "m5.xlarge"
-	AWSWorkerInstanceType       InstanceType = "m5.xlarge"
+	AWSWorkerInstanceType       InstanceType = "m5.2xlarge"
 )
 
 type AWSNodeSpec struct {
@@ -31,6 +32,18 @@ type AWSNodeSpec struct {
 	AdditionalSecurityGroups AdditionalSecurityGroup `json:"additionalSecurityGroups,omitempty"`
 }
 
+func NewAWSControlPlaneNodeSpec() *AWSNodeSpec {
+	return &AWSNodeSpec{
+		InstanceType: ptr.To(AWSControlPlaneInstanceType),
+	}
+}
+
+func NewAWSWorkerNodeSpec() *AWSNodeSpec {
+	return &AWSNodeSpec{
+		InstanceType: ptr.To(AWSWorkerInstanceType),
+	}
+}
+
 type AdditionalSecurityGroup []SecurityGroup
 
 type SecurityGroup struct {
@@ -57,37 +70,21 @@ func (AdditionalSecurityGroup) VariableSchema() clusterv1.VariableSchema {
 }
 
 func (a AWSNodeSpec) VariableSchema() clusterv1.VariableSchema {
-	instanceType := InstanceType("")
-	if a.InstanceType != nil {
-		instanceType = *a.InstanceType
-	}
-
 	return clusterv1.VariableSchema{
 		OpenAPIV3Schema: clusterv1.JSONSchemaProps{
 			Description: "AWS Node configuration",
 			Type:        "object",
 			Properties: map[string]clusterv1.JSONSchemaProps{
 				"iamInstanceProfile":       IAMInstanceProfile("").VariableSchema().OpenAPIV3Schema,
-				"instanceType":             instanceType.VariableSchema().OpenAPIV3Schema,
+				"instanceType":             a.InstanceType.VariableSchema().OpenAPIV3Schema,
 				"ami":                      AMISpec{}.VariableSchema().OpenAPIV3Schema,
 				"additionalSecurityGroups": AdditionalSecurityGroup{}.VariableSchema().OpenAPIV3Schema,
 			},
+			Required: []string{"instanceType"},
 		},
 	}
 }
 
-func AWSControlPlaneNodeSpec() *AWSNodeSpec {
-	return &AWSNodeSpec{
-		InstanceType: ptr.To(AWSControlPlaneInstanceType),
-	}
-}
-
-func AWSWorkerNodeSpec() *AWSNodeSpec {
-	return &AWSNodeSpec{
-		InstanceType: ptr.To(AWSWorkerInstanceType),
-	}
-}
-
 type IAMInstanceProfile string
 
 func (IAMInstanceProfile) VariableSchema() clusterv1.VariableSchema {
@@ -111,18 +108,6 @@ func (i InstanceType) VariableSchema() clusterv1.VariableSchema {
 	}
 }
 
-type ControlPlaneInstanceType string
-
-func (ControlPlaneInstanceType) VariableSchema() clusterv1.VariableSchema {
-	return clusterv1.VariableSchema{
-		OpenAPIV3Schema: clusterv1.JSONSchemaProps{
-			Type:        "string",
-			Description: "The AWS instance type to use for the cluster Machines",
-			Default:     variables.MustMarshal("m5.xlarge"),
-		},
-	}
-}
-
 type AMISpec struct {
 	// ID is an explicit AMI to use.
 	// +optional

api/v1alpha1/clusterconfig_types.go

@@ -57,9 +57,6 @@ type ClusterConfigSpec struct {
 
 func (s ClusterConfigSpec) VariableSchema() clusterv1.VariableSchema { //nolint:gocritic,lll // Passed by value for no potential side-effect.
 	clusterConfigProps := GenericClusterConfig{}.VariableSchema()
-	if s.ControlPlane == nil {
-		s.ControlPlane = &NodeConfigSpec{}
-	}
 	switch {
 	case s.AWS != nil:
 		maps.Copy(
@@ -94,11 +91,11 @@ func (s ClusterConfigSpec) VariableSchema() clusterv1.VariableSchema { //nolint:
 	return clusterConfigProps
 }
 
-func DefaultAWSClusterConfigSpec() *ClusterConfigSpec {
+func NewAWSClusterConfigSpec() *ClusterConfigSpec {
 	return &ClusterConfigSpec{
 		AWS: &AWSSpec{},
 		ControlPlane: &NodeConfigSpec{
-			AWS: AWSControlPlaneNodeSpec(),
+			AWS: NewAWSControlPlaneNodeSpec(),
 		},
 	}
 }

api/v1alpha1/node_types.go

@@ -63,9 +63,9 @@ func (s NodeConfigSpec) VariableSchema() clusterv1.VariableSchema {
 	return nodeConfigProps
 }
 
-func DefaultAWSWorkerConfigSpec() *NodeConfigSpec {
+func NewAWSWorkerConfigSpec() *NodeConfigSpec {
 	return &NodeConfigSpec{
-		AWS: AWSWorkerNodeSpec(),
+		AWS: NewAWSWorkerNodeSpec(),
 	}
 }
 

pkg/handlers/aws/clusterconfig/variables.go

@@ -43,7 +43,7 @@ func (h *awsClusterConfigVariableHandler) DiscoverVariables(
 	resp.Variables = append(resp.Variables, clusterv1.ClusterClassVariable{
 		Name:     clusterconfig.MetaVariableName,
 		Required: true,
-		Schema:   v1alpha1.DefaultAWSClusterConfigSpec().VariableSchema(),
+		Schema:   v1alpha1.NewAWSClusterConfigSpec().VariableSchema(),
 	})
 	resp.SetStatus(runtimehooksv1.ResponseStatusSuccess)
 }

pkg/handlers/aws/mutation/ami/variables_test.go

@@ -18,7 +18,7 @@ func TestVariableValidation(t *testing.T) {
 	capitest.ValidateDiscoverVariables(
 		t,
 		clusterconfig.MetaVariableName,
-		ptr.To(v1alpha1.ClusterConfigSpec{AWS: &v1alpha1.AWSSpec{}}.VariableSchema()),
+		ptr.To(v1alpha1.NewAWSClusterConfigSpec().VariableSchema()),
 		true,
 		awsclusterconfig.NewVariable,
 		capitest.VariableTestDef{

pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go

@@ -19,7 +19,7 @@ func TestVariableValidation(t *testing.T) {
 	capitest.ValidateDiscoverVariables(
 		t,
 		clusterconfig.MetaVariableName,
-		ptr.To(v1alpha1.ClusterConfigSpec{AWS: &v1alpha1.AWSSpec{}}.VariableSchema()),
+		ptr.To(v1alpha1.NewAWSClusterConfigSpec().VariableSchema()),
 		true,
 		awsclusterconfig.NewVariable,
 		capitest.VariableTestDef{

pkg/handlers/aws/mutation/iaminstanceprofile/variables_test.go

@@ -18,7 +18,7 @@ func TestVariableValidation(t *testing.T) {
 	capitest.ValidateDiscoverVariables(
 		t,
 		clusterconfig.MetaVariableName,
-		ptr.To(v1alpha1.ClusterConfigSpec{AWS: &v1alpha1.AWSSpec{}}.VariableSchema()),
+		ptr.To(v1alpha1.NewAWSClusterConfigSpec().VariableSchema()),
 		true,
 		awsclusterconfig.NewVariable,
 		capitest.VariableTestDef{

pkg/handlers/aws/mutation/instancetype/variables_test.go

@@ -18,7 +18,7 @@ func TestVariableValidation(t *testing.T) {
 	capitest.ValidateDiscoverVariables(
 		t,
 		clusterconfig.MetaVariableName,
-		ptr.To(v1alpha1.DefaultAWSClusterConfigSpec().VariableSchema()),
+		ptr.To(v1alpha1.NewAWSClusterConfigSpec().VariableSchema()),
 		true,
 		awsclusterconfig.NewVariable,
 		capitest.VariableTestDef{

pkg/handlers/aws/mutation/network/variables_test.go

@@ -18,7 +18,7 @@ func TestVariableValidation(t *testing.T) {
 	capitest.ValidateDiscoverVariables(
 		t,
 		clusterconfig.MetaVariableName,
-		ptr.To(v1alpha1.ClusterConfigSpec{AWS: &v1alpha1.AWSSpec{}}.VariableSchema()),
+		ptr.To(v1alpha1.NewAWSClusterConfigSpec().VariableSchema()),
 		true,
 		awsclusterconfig.NewVariable,
 		capitest.VariableTestDef{

pkg/handlers/aws/mutation/region/variables_test.go

@@ -18,7 +18,7 @@ func TestVariableValidation(t *testing.T) {
 	capitest.ValidateDiscoverVariables(
 		t,
 		clusterconfig.MetaVariableName,
-		ptr.To(v1alpha1.ClusterConfigSpec{AWS: &v1alpha1.AWSSpec{}}.VariableSchema()),
+		ptr.To(v1alpha1.NewAWSClusterConfigSpec().VariableSchema()),
 		true,
 		awsclusterconfig.NewVariable,
 		capitest.VariableTestDef{

pkg/handlers/aws/mutation/securitygroups/variables_test.go

@@ -18,7 +18,7 @@ func TestVariableValidation(t *testing.T) {
 	capitest.ValidateDiscoverVariables(
 		t,
 		clusterconfig.MetaVariableName,
-		ptr.To(v1alpha1.ClusterConfigSpec{AWS: &v1alpha1.AWSSpec{}}.VariableSchema()),
+		ptr.To(v1alpha1.NewAWSClusterConfigSpec().VariableSchema()),
 		true,
 		awsclusterconfig.NewVariable,
 		capitest.VariableTestDef{

pkg/handlers/aws/workerconfig/variables.go

@@ -43,7 +43,7 @@ func (h *awsWorkerConfigVariableHandler) DiscoverVariables(
 	resp.Variables = append(resp.Variables, clusterv1.ClusterClassVariable{
 		Name:     workerconfig.MetaVariableName,
 		Required: false,
-		Schema:   v1alpha1.DefaultAWSWorkerConfigSpec().VariableSchema(),
+		Schema:   v1alpha1.NewAWSWorkerConfigSpec().VariableSchema(),
 	})
 	resp.SetStatus(runtimehooksv1.ResponseStatusSuccess)
 }

pkg/handlers/aws/workerconfig/variables_test.go

@@ -17,7 +17,7 @@ func TestVariableValidation(t *testing.T) {
 	capitest.ValidateDiscoverVariables(
 		t,
 		workerconfig.MetaVariableName,
-		ptr.To(v1alpha1.DefaultAWSWorkerConfigSpec().VariableSchema()),
+		ptr.To(v1alpha1.NewAWSWorkerConfigSpec().VariableSchema()),
 		false,
 		NewVariable,
 		capitest.VariableTestDef{