From 08e81444cb17e7286e08f36dbdb262e79e9c4890 Mon Sep 17 00:00:00 2001 From: Roman Bednar Date: Wed, 22 May 2024 14:15:31 +0200 Subject: [PATCH] add listType marker to TopologyCategories --- openapi/generated_openapi/zz_generated.openapi.go | 5 +++++ openapi/openapi.json | 3 ++- operator/v1/types_csi_cluster_driver.go | 1 + .../0000_90_csi-driver_01_clustercsidrivers.crd.yaml | 1 + .../clustercsidrivers.operator.openshift.io/AAA_ungated.yaml | 1 + .../VSphereDriverConfiguration.yaml | 1 + 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index f03801a6ae1..23d861e7d07 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -54059,6 +54059,11 @@ func schema_openshift_api_operator_v1_VSphereCSIDriverConfigSpec(ref common.Refe Type: []string{"object"}, Properties: map[string]spec.Schema{ "topologyCategories": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, SchemaProps: spec.SchemaProps{ Description: "topologyCategories indicates tag categories with which vcenter resources such as hostcluster or datacenter were tagged with. If cluster Infrastructure object has a topology, values specified in Infrastructure object will be used and modifications to topologyCategories will be rejected.", Type: []string{"array"}, diff --git a/openapi/openapi.json b/openapi/openapi.json index 1c6419b45df..26037359af0 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -31578,7 +31578,8 @@ "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" } } }, diff --git a/operator/v1/types_csi_cluster_driver.go b/operator/v1/types_csi_cluster_driver.go index 349c8d461d5..4fccecb9f67 100644 --- a/operator/v1/types_csi_cluster_driver.go +++ b/operator/v1/types_csi_cluster_driver.go @@ -279,6 +279,7 @@ type VSphereCSIDriverConfigSpec struct { // If cluster Infrastructure object has a topology, values specified in // Infrastructure object will be used and modifications to topologyCategories // will be rejected. + // +listType=atomic // +optional TopologyCategories []string `json:"topologyCategories,omitempty"` diff --git a/operator/v1/zz_generated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers.crd.yaml index 8bd7d2a18b1..96c6bdc01ae 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers.crd.yaml @@ -247,6 +247,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object required: - driverType diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AAA_ungated.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AAA_ungated.yaml index 3d4ea2846ca..902ce8f3380 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AAA_ungated.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AAA_ungated.yaml @@ -194,6 +194,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object required: - driverType diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/VSphereDriverConfiguration.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/VSphereDriverConfiguration.yaml index bd169118226..2c02bdc3649 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/VSphereDriverConfiguration.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/VSphereDriverConfiguration.yaml @@ -227,6 +227,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic type: object required: - driverType