Merge pull request #1279 from barbacbd/CORS-3648-release-4.16

openshift-merge-bot[bot] · web-flow · commit 9f9c6baabf6e · 2024-08-29T02:24:54.000Z
CORS-3648: Add the hyperdisk-balanced disk type
diff --git a/pkg/webhooks/machine_webhook.go b/pkg/webhooks/machine_webhook.go
@@ -1301,7 +1301,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
@@ -3319,7 +3319,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
`@@ -1301,7 +1301,7 @@ func validateGCPDisks(disks []machinev1beta1.GCPDisk, parentPath field.Path) f`
`1301`	`1301`	`}`
`1302`	`1302`
`1303`	`1303`	`if disk.Type != "" {`
`1304`		`- diskTypes := sets.NewString("pd-standard", "pd-ssd", "pd-balanced")`
	`1304`	`+ diskTypes := sets.NewString("pd-standard", "pd-ssd", "pd-balanced", "hyperdisk-balanced")`
`1305`	`1305`	`if !diskTypes.Has(disk.Type) {`
`1306`	`1306`	`errs = append(errs, field.NotSupported(fldPath.Child("type"), disk.Type, diskTypes.List()))`
`1307`	`1307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3319,7 +3319,7 @@ func TestValidateGCPProviderSpec(t *testing.T) {`
`3319`	`3319`	`}`
`3320`	`3320`	`},`
`3321`	`3321`	`expectedOk: false,`
`3322`		`- expectedError: "providerSpec.disks[0].type: Unsupported value: \"invalid\": supported values: \"pd-balanced\", \"pd-ssd\", \"pd-standard\"",`
	`3322`	`+ expectedError: "providerSpec.disks[0].type: Unsupported value: \"invalid\": supported values: \"hyperdisk-balanced\", \"pd-balanced\", \"pd-ssd\", \"pd-standard\"",`
`3323`	`3323`	`},`
`3324`	`3324`	`{`
`3325`	`3325`	`testCase: "with a disk type that is supported",`