Merge pull request #1301 from nutanix-cloud-native/nutanix-multi-subnets

CORS-3741: [Nutanix] support multi-subnets in Machine providerSpec

Author: openshift-merge-bot[bot]

Diff for: go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/onsi/ginkgo/v2 v2.20.2
 	github.com/onsi/gomega v1.34.2
-	github.com/openshift/api v0.0.0-20240924155631-232984653385
+	github.com/openshift/api v0.0.0-20241118215836-09b63162bb15
 	github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd
 	github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20241007145816-7038c320d36c
 	github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240909043600-373ac49835bf

Diff for: go.sum

@@ -371,8 +371,8 @@ github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4
 github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
 github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
 github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
-github.com/openshift/api v0.0.0-20240924155631-232984653385 h1:P6O191HwBj0ahEfea2wkvxhmW2fzXhvCh8hwHDvUozM=
-github.com/openshift/api v0.0.0-20240924155631-232984653385/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
+github.com/openshift/api v0.0.0-20241118215836-09b63162bb15 h1:5bt8CBbXv1iSmBNCBXugsIT04NgHFCSkM1mOyuE8s2Q=
+github.com/openshift/api v0.0.0-20241118215836-09b63162bb15/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
 github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd h1:Gd0+bYdcfGIsDOJ8BwTJJjQeXoziyIsTwqp/s38rKyM=
 github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd/go.mod h1:EB7GeA/vpf9AHklMgnnT0+uG6l/3f8cChtCFbJFrk4g=
 github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20241007145816-7038c320d36c h1:9A/0QoTZo2xh5j6nmh5CGNVBG8Ql1RmXmCcrikBnG+w=

Diff for: install/0000_30_machine-api-operator_02_machine.CustomNoUpgrade.crd.yaml

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"reflect"
 	"regexp"
 	goruntime "runtime"
 	"strconv"
@@ -1588,19 +1589,30 @@ func validateNutanix(m *machinev1beta1.Machine, config *admissionConfig) (bool,
 	if err := validateNutanixResourceIdentifier("image", providerSpec.Image); err != nil {
 		errs = append(errs, err)
 	}
-	// Currently, we only support one subnet per VM in Openshift
-	// We may extend this to support more than one subnet per VM in future releases
-	if len(providerSpec.Subnets) == 0 {
+
+	numSubnets := len(providerSpec.Subnets)
+	switch {
+	case numSubnets == 0:
 		subnets, _ := json.Marshal(providerSpec.Subnets)
 		errs = append(errs, field.Invalid(field.NewPath("providerSpec", "subnets"), string(subnets), "missing subnets: nodes may fail to start if no subnets are configured"))
-	} else if len(providerSpec.Subnets) > 1 {
-		subnets, _ := json.Marshal(providerSpec.Subnets)
-		errs = append(errs, field.Invalid(field.NewPath("providerSpec", "subnets"), string(subnets), "too many subnets: currently nutanix platform supports one subnet per VM but more than one subnets are configured"))
-	}
+	case numSubnets > 32:
+		errs = append(errs, field.TooMany(field.NewPath("providerSpec", "subnets"), numSubnets, 32))
+	default:
+		subnets := []machinev1.NutanixResourceIdentifier{}
+		for _, subnet := range providerSpec.Subnets {
+			if err := validateNutanixResourceIdentifier("subnet", subnet); err != nil {
+				errs = append(errs, err)
+			} else {
+				// check duplication
+				for _, other := range subnets {
+					if reflect.DeepEqual(subnet, other) {
+						subnetData, _ := json.Marshal(subnet)
+						errs = append(errs, field.Invalid(field.NewPath("providerSpec", "subnets"), string(subnetData), "should not configure duplicate subnet value"))
+					}
+				}
+			}
 
-	for _, subnet := range providerSpec.Subnets {
-		if err := validateNutanixResourceIdentifier("subnet", subnet); err != nil {
-			errs = append(errs, err)
+			subnets = append(subnets, subnet)
 		}
 	}
 

Diff for: install/0000_30_machine-api-operator_02_machine.Default.crd.yaml

@@ -1146,6 +1146,79 @@ func TestMachineCreation(t *testing.T) {
 			},
 			expectedError: "[providerSpec.cluster.type: Invalid value: \"\": cluster type must be one of name or uuid, providerSpec.image.type: Invalid value: \"\": image type must be one of name or uuid, providerSpec.subnets: Invalid value: \"null\": missing subnets: nodes may fail to start if no subnets are configured]",
 		},
+		{
+			name:            "with nutanix and too many subnets set",
+			platformType:    osconfigv1.NutanixPlatformType,
+			clusterID:       "nutanix-cluster",
+			presetClusterID: true,
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1.NutanixMachineProviderConfig{
+					VCPUSockets:    minNutanixCPUSockets,
+					VCPUsPerSocket: minNutanixCPUPerSocket,
+					MemorySize:     resource.MustParse(fmt.Sprintf("%dMi", minNutanixMemoryMiB)),
+					SystemDiskSize: resource.MustParse(fmt.Sprintf("%dGi", minNutanixDiskGiB)),
+					Subnets: []machinev1.NutanixResourceIdentifier{
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-1")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-2")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-3")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-4")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-5")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-6")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-7")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-8")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-9")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-10")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-11")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-12")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-13")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-14")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-15")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-16")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-17")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-18")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-19")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-20")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-21")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-22")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-23")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-24")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-25")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-26")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-27")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-28")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-29")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-30")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-31")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-32")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-33")},
+					},
+					Cluster: machinev1.NutanixResourceIdentifier{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("cluster-1")},
+					Image:   machinev1.NutanixResourceIdentifier{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("image-1")},
+				},
+			},
+			expectedError: "providerSpec.subnets: Too many: 33: must have at most 32 items",
+		},
+		{
+			name:            "with nutanix and duplicate subnet set",
+			platformType:    osconfigv1.NutanixPlatformType,
+			clusterID:       "nutanix-cluster",
+			presetClusterID: true,
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1.NutanixMachineProviderConfig{
+					VCPUSockets:    minNutanixCPUSockets,
+					VCPUsPerSocket: minNutanixCPUPerSocket,
+					MemorySize:     resource.MustParse(fmt.Sprintf("%dMi", minNutanixMemoryMiB)),
+					SystemDiskSize: resource.MustParse(fmt.Sprintf("%dGi", minNutanixDiskGiB)),
+					Subnets: []machinev1.NutanixResourceIdentifier{
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-1")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-1")},
+					},
+					Cluster: machinev1.NutanixResourceIdentifier{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("cluster-1")},
+					Image:   machinev1.NutanixResourceIdentifier{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("image-1")},
+				},
+			},
+			expectedError: `providerSpec.subnets: Invalid value: "{\"type\":\"name\",\"name\":\"subnet-1\"}": should not configure duplicate subnet value`,
+		},
 		{
 			name:            "with nutanix and the required fields set",
 			platformType:    osconfigv1.NutanixPlatformType,
@@ -1159,6 +1232,7 @@ func TestMachineCreation(t *testing.T) {
 					SystemDiskSize: resource.MustParse(fmt.Sprintf("%dGi", minNutanixDiskGiB)),
 					Subnets: []machinev1.NutanixResourceIdentifier{
 						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-1")},
+						{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-2")},
 					},
 					Cluster: machinev1.NutanixResourceIdentifier{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("cluster-1")},
 					Image:   machinev1.NutanixResourceIdentifier{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("image-1")},
@@ -5056,17 +5130,6 @@ func TestValidateNutanixProviderSpec(t *testing.T) {
 			expectedError: "providerSpec.subnets: Invalid value: \"[]\": missing subnets: nodes may fail to start if no subnets are configured",
 			//expectedWarnings: []string{"providerSpec.subnets: missing subnets: nodes may fail to start if no subnets are configured"},
 		},
-		{
-			testCase: "with too many subnets provided",
-			modifySpec: func(p *machinev1.NutanixMachineProviderConfig) {
-				p.Subnets = []machinev1.NutanixResourceIdentifier{
-					{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-1")},
-					{Type: machinev1.NutanixIdentifierName, Name: ptr.To[string]("subnet-2")},
-				}
-			},
-			expectedOk:    false,
-			expectedError: "providerSpec.subnets: Invalid value: \"[{\\\"type\\\":\\\"name\\\",\\\"name\\\":\\\"subnet-1\\\"},{\\\"type\\\":\\\"name\\\",\\\"name\\\":\\\"subnet-2\\\"}]\": too many subnets: currently nutanix platform supports one subnet per VM but more than one subnets are configured",
-		},
 		{
 			testCase: "with no userDataSecret provided",
 			modifySpec: func(p *machinev1.NutanixMachineProviderConfig) {