From 5e9d35e69a45e96af7e7f18acfa65d5d4e9a2c21 Mon Sep 17 00:00:00 2001 From: Jonathan Dobson Date: Wed, 12 Apr 2023 16:23:41 -0600 Subject: [PATCH] OCPBUGS-11776: VSphereStorageDriver does not document the platform default --- openapi/generated_openapi/zz_generated.openapi.go | 2 +- openapi/openapi.json | 2 +- operator/v1/0000_50_cluster_storage_operator_01_crd.yaml | 2 +- operator/v1/types_storage.go | 1 + operator/v1/zz_generated.swagger_doc_generated.go | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index e66a4e53624..ddfa5b8757d 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -46069,7 +46069,7 @@ func schema_openshift_api_operator_v1_StorageSpec(ref common.ReferenceCallback) }, "vsphereStorageDriver": { SchemaProps: spec.SchemaProps{ - Description: "VSphereStorageDriver indicates the storage driver to use on VSphere clusters. Once this field is set to CSIWithMigrationDriver, it can not be changed. If this is empty, the platform will choose a good default, which may change over time without notice. DEPRECATED: This field will be removed in a future release.", + Description: "VSphereStorageDriver indicates the storage driver to use on VSphere clusters. Once this field is set to CSIWithMigrationDriver, it can not be changed. If this is empty, the platform will choose a good default, which may change over time without notice. The current default is LegacyDeprecatedInTreeDriver. DEPRECATED: This field will be removed in a future release.", Default: "", Type: []string{"string"}, Format: "", diff --git a/openapi/openapi.json b/openapi/openapi.json index edeb51c73cf..6d5c9364695 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -26995,7 +26995,7 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" }, "vsphereStorageDriver": { - "description": "VSphereStorageDriver indicates the storage driver to use on VSphere clusters. Once this field is set to CSIWithMigrationDriver, it can not be changed. If this is empty, the platform will choose a good default, which may change over time without notice. DEPRECATED: This field will be removed in a future release.", + "description": "VSphereStorageDriver indicates the storage driver to use on VSphere clusters. Once this field is set to CSIWithMigrationDriver, it can not be changed. If this is empty, the platform will choose a good default, which may change over time without notice. The current default is LegacyDeprecatedInTreeDriver. DEPRECATED: This field will be removed in a future release.", "type": "string", "default": "" } diff --git a/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml b/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml index 08e011b117c..3a07026f2af 100644 --- a/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml +++ b/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml @@ -70,7 +70,7 @@ spec: nullable: true x-kubernetes-preserve-unknown-fields: true vsphereStorageDriver: - description: 'VSphereStorageDriver indicates the storage driver to use on VSphere clusters. Once this field is set to CSIWithMigrationDriver, it can not be changed. If this is empty, the platform will choose a good default, which may change over time without notice. DEPRECATED: This field will be removed in a future release.' + description: 'VSphereStorageDriver indicates the storage driver to use on VSphere clusters. Once this field is set to CSIWithMigrationDriver, it can not be changed. If this is empty, the platform will choose a good default, which may change over time without notice. The current default is LegacyDeprecatedInTreeDriver. DEPRECATED: This field will be removed in a future release.' type: string enum: - "" diff --git a/operator/v1/types_storage.go b/operator/v1/types_storage.go index aaf011542f5..271d5c03351 100644 --- a/operator/v1/types_storage.go +++ b/operator/v1/types_storage.go @@ -44,6 +44,7 @@ type StorageSpec struct { // Once this field is set to CSIWithMigrationDriver, it can not be changed. // If this is empty, the platform will choose a good default, // which may change over time without notice. + // The current default is LegacyDeprecatedInTreeDriver. // DEPRECATED: This field will be removed in a future release. // +kubebuilder:validation:XValidation:rule="oldSelf != \"CSIWithMigrationDriver\" || self == \"CSIWithMigrationDriver\"",message="VSphereStorageDriver can not be changed once it is set to CSIWithMigrationDriver" // +optional diff --git a/operator/v1/zz_generated.swagger_doc_generated.go b/operator/v1/zz_generated.swagger_doc_generated.go index 1248ffb1b08..727344550de 100644 --- a/operator/v1/zz_generated.swagger_doc_generated.go +++ b/operator/v1/zz_generated.swagger_doc_generated.go @@ -1611,7 +1611,7 @@ func (StorageList) SwaggerDoc() map[string]string { var map_StorageSpec = map[string]string{ "": "StorageSpec is the specification of the desired behavior of the cluster storage operator.", - "vsphereStorageDriver": "VSphereStorageDriver indicates the storage driver to use on VSphere clusters. Once this field is set to CSIWithMigrationDriver, it can not be changed. If this is empty, the platform will choose a good default, which may change over time without notice. DEPRECATED: This field will be removed in a future release.", + "vsphereStorageDriver": "VSphereStorageDriver indicates the storage driver to use on VSphere clusters. Once this field is set to CSIWithMigrationDriver, it can not be changed. If this is empty, the platform will choose a good default, which may change over time without notice. The current default is LegacyDeprecatedInTreeDriver. DEPRECATED: This field will be removed in a future release.", } func (StorageSpec) SwaggerDoc() map[string]string {