From 78abbaa0e66f4058092157f5cbcdc3d56ee377dd Mon Sep 17 00:00:00 2001 From: vr4manta Date: Tue, 5 Nov 2024 14:33:47 -0500 Subject: [PATCH] Made changes for new feature requirements --- features/features.go | 1 + machine/v1beta1/zz_generated.swagger_doc_generated.go | 1 + openapi/generated_openapi/zz_generated.openapi.go | 9 ++++++++- openapi/openapi.json | 6 +++++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/features/features.go b/features/features.go index 97558321d8e..7810502992f 100644 --- a/features/features.go +++ b/features/features.go @@ -199,6 +199,7 @@ var ( reportProblemsToJiraComponent("splat"). contactPerson("vr4manta"). productScope(ocpSpecific). + enhancementPR("https://github.com/openshift/enhancements/pull/1709"). enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). mustRegister() diff --git a/machine/v1beta1/zz_generated.swagger_doc_generated.go b/machine/v1beta1/zz_generated.swagger_doc_generated.go index 0827a98d8b5..0417b653db7 100644 --- a/machine/v1beta1/zz_generated.swagger_doc_generated.go +++ b/machine/v1beta1/zz_generated.swagger_doc_generated.go @@ -785,6 +785,7 @@ func (NetworkSpec) SwaggerDoc() map[string]string { var map_VSphereDisk = map[string]string{ "": "VSphereDisk describes additional disks for vSphere.", + "name": "name is a name to be used to identify the disk definition. If deviceName is not specified, the disk will still be created. The deviceName should be unique so that it can be used to clearly identify purpose of the disk, but is not required to be unique.", "sizeGiB": "sizeGiB is the size of the disk (in GiB).", } diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index ce1f894c549..23a5cffcc89 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -38543,12 +38543,19 @@ func schema_openshift_api_machine_v1beta1_VSphereDisk(ref common.ReferenceCallba Description: "VSphereDisk describes additional disks for vSphere.", Type: []string{"object"}, Properties: map[string]spec.Schema{ + "name": { + SchemaProps: spec.SchemaProps{ + Description: "name is a name to be used to identify the disk definition. If deviceName is not specified, the disk will still be created. The deviceName should be unique so that it can be used to clearly identify purpose of the disk, but is not required to be unique.", + Type: []string{"string"}, + Format: "", + }, + }, "sizeGiB": { SchemaProps: spec.SchemaProps{ Description: "sizeGiB is the size of the disk (in GiB).", Default: 0, Type: []string{"integer"}, - Format: "int64", + Format: "int32", }, }, }, diff --git a/openapi/openapi.json b/openapi/openapi.json index 6e57df0c953..bafcdd40f1c 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -22255,10 +22255,14 @@ "sizeGiB" ], "properties": { + "name": { + "description": "name is a name to be used to identify the disk definition. If deviceName is not specified, the disk will still be created. The deviceName should be unique so that it can be used to clearly identify purpose of the disk, but is not required to be unique.", + "type": "string" + }, "sizeGiB": { "description": "sizeGiB is the size of the disk (in GiB).", "type": "integer", - "format": "int64", + "format": "int32", "default": 0 } }