Merge pull request #1242 from chiragkyal/partition-number

CFE-1065: Add support for PlacementGroupPartition of placement group

Author: openshift-merge-bot[bot]

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/onsi/ginkgo/v2 v2.17.1
 	github.com/onsi/gomega v1.32.0
-	github.com/openshift/api v0.0.0-20240530053948-b01900f1982a
+	github.com/openshift/api v0.0.0-20240613141850-76a71dac36a0
 	github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
 	github.com/openshift/library-go v0.0.0-20240116081341-964bcb3f545c
 	github.com/prometheus/client_golang v1.18.0

go.sum

@@ -476,8 +476,8 @@ github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8
 github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
 github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk=
 github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg=
-github.com/openshift/api v0.0.0-20240530053948-b01900f1982a h1:EyLN5c8dxine8V9XaBzG76p1UEY8W0aP97EOvv36eOY=
-github.com/openshift/api v0.0.0-20240530053948-b01900f1982a/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
+github.com/openshift/api v0.0.0-20240613141850-76a71dac36a0 h1:Kn16YZDBGwetg+pMQ0u0/3aOxRXQJi/1lu6rIlK+1So=
+github.com/openshift/api v0.0.0-20240613141850-76a71dac36a0/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
 github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
 github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8=
 github.com/openshift/library-go v0.0.0-20240116081341-964bcb3f545c h1:gLylEQQryG+A6nqWYIwE1wUzn1eFUmthjADvflMWKnM=

pkg/webhooks/machine_webhook.go

@@ -746,6 +746,17 @@ func validateAWS(m *machinev1beta1.Machine, config *admissionConfig) (bool, []st
 		)
 	}
 
+	if providerSpec.PlacementGroupName == "" && providerSpec.PlacementGroupPartition != 0 {
+		errs = append(
+			errs,
+			field.Invalid(
+				field.NewPath("providerSpec", "placementGroupPartition"),
+				providerSpec.PlacementGroupPartition,
+				"providerSpec.placementGroupPartition is set but providerSpec.placementGroupName is empty",
+			),
+		)
+	}
+
 	duplicatedTags := getDuplicatedTags(providerSpec.Tags)
 	if len(duplicatedTags) > 0 {
 		warnings = append(warnings, fmt.Sprintf("providerSpec.tags: duplicated tag names (%s): only the first value will be used.", strings.Join(duplicatedTags, ",")))

pkg/webhooks/machine_webhook_test.go

@@ -2133,6 +2133,30 @@ func TestValidateAWSProviderSpec(t *testing.T) {
 			expectedOk:    false,
 			expectedError: "providerSpec.tenancy: Invalid value: \"invalid\": Invalid providerSpec.tenancy, the only allowed options are: default, dedicated, host",
 		},
+		{
+			testCase: "fail if placementGroupPartition is set, but placementGroupName is empty",
+			modifySpec: func(p *machinev1beta1.AWSMachineProviderConfig) {
+				p.PlacementGroupName = ""
+				p.PlacementGroupPartition = 2
+			},
+			expectedOk:    false,
+			expectedError: "providerSpec.placementGroupPartition: Invalid value: 2: providerSpec.placementGroupPartition is set but providerSpec.placementGroupName is empty",
+		},
+		{
+			testCase: "allow if only placementGroupName is set",
+			modifySpec: func(p *machinev1beta1.AWSMachineProviderConfig) {
+				p.PlacementGroupName = "placement-group"
+			},
+			expectedOk: true,
+		},
+		{
+			testCase: "allow if both placementGroupName and placementGroupPartition are set",
+			modifySpec: func(p *machinev1beta1.AWSMachineProviderConfig) {
+				p.PlacementGroupName = "placement-group"
+				p.PlacementGroupPartition = 2
+			},
+			expectedOk: true,
+		},
 		{
 			testCase: "with no iam instance profile",
 			modifySpec: func(p *machinev1beta1.AWSMachineProviderConfig) {