Merge pull request #1268 from barbacbd/CORS-3580

openshift-merge-bot[bot] · web-flow · commit 3a817c78946a · 2024-07-22T14:53:13.000Z
CORS-3580: Add the hyperdisk-balanced disk type
diff --git a/pkg/webhooks/machine_webhook.go b/pkg/webhooks/machine_webhook.go
@@ -1327,7 +1327,7 @@ func validateGCPDisks(disks []*machinev1beta1.GCPDisk, parentPath *field.Path) f
 		}
 
 		if disk.Type != "" {
-			diskTypes := sets.NewString("pd-standard", "pd-ssd", "pd-balanced")
+			diskTypes := sets.NewString("pd-standard", "pd-ssd", "pd-balanced", "hyperdisk-balanced")
 			if !diskTypes.Has(disk.Type) {
 				errs = append(errs, field.NotSupported(fldPath.Child("type"), disk.Type, diskTypes.List()))
 			}
diff --git a/pkg/webhooks/machine_webhook_test.go b/pkg/webhooks/machine_webhook_test.go
@@ -3365,7 +3365,7 @@ func TestValidateGCPProviderSpec(t *testing.T) {
 				}
 			},
 			expectedOk:    false,
-			expectedError: "providerSpec.disks[0].type: Unsupported value: \"invalid\": supported values: \"pd-balanced\", \"pd-ssd\", \"pd-standard\"",
+			expectedError: "providerSpec.disks[0].type: Unsupported value: \"invalid\": supported values: \"hyperdisk-balanced\", \"pd-balanced\", \"pd-ssd\", \"pd-standard\"",
 		},
 		{
 			testCase: "with a disk type that is supported",

Original file line number	Diff line number	Diff line change
`@@ -1327,7 +1327,7 @@ func validateGCPDisks(disks []machinev1beta1.GCPDisk, parentPath field.Path) f`
`1327`	`1327`	`}`
`1328`	`1328`
`1329`	`1329`	`if disk.Type != "" {`
`1330`		`- diskTypes := sets.NewString("pd-standard", "pd-ssd", "pd-balanced")`
	`1330`	`+ diskTypes := sets.NewString("pd-standard", "pd-ssd", "pd-balanced", "hyperdisk-balanced")`
`1331`	`1331`	`if !diskTypes.Has(disk.Type) {`
`1332`	`1332`	`errs = append(errs, field.NotSupported(fldPath.Child("type"), disk.Type, diskTypes.List()))`
`1333`	`1333`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3365,7 +3365,7 @@ func TestValidateGCPProviderSpec(t *testing.T) {`
`3365`	`3365`	`}`
`3366`	`3366`	`},`
`3367`	`3367`	`expectedOk: false,`
`3368`		`- expectedError: "providerSpec.disks[0].type: Unsupported value: \"invalid\": supported values: \"pd-balanced\", \"pd-ssd\", \"pd-standard\"",`
	`3368`	`+ expectedError: "providerSpec.disks[0].type: Unsupported value: \"invalid\": supported values: \"hyperdisk-balanced\", \"pd-balanced\", \"pd-ssd\", \"pd-standard\"",`
`3369`	`3369`	`},`
`3370`	`3370`	`{`
`3371`	`3371`	`testCase: "with a disk type that is supported",`