From 577313ee6f96059db01dcba3add0a7aca52cb734 Mon Sep 17 00:00:00 2001 From: Richard Vanderpool <49568690+rvanderp3@users.noreply.github.com> Date: Wed, 11 Sep 2024 14:02:46 -0400 Subject: [PATCH 1/2] allow additional tags to be defined in infrastructure failure domains --- config/v1/types_infrastructure.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go index 392d128c111..319468ca9ef 100644 --- a/config/v1/types_infrastructure.go +++ b/config/v1/types_infrastructure.go @@ -1182,6 +1182,12 @@ type VSpherePlatformFailureDomainSpec struct { // + Validation is applied via a patch, we validate the format as either ipv4, ipv6 or hostname Server string `json:"server"` + // tagIDs is an optional set of tags to add to an instance. Specified tagIDs + // must use URN-notation instead of display names. A maximum of 10 tag IDs may be specified. + // +kubebuilder:example=urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9578:GLOBAL + // +optional + TagIDs []string `json:"tagIDs,omitempty"` + // Topology describes a given failure domain using vSphere constructs // +kubebuilder:validation:Required Topology VSpherePlatformTopology `json:"topology"` From e5ffa80632e7553ae35604c5d1ba16494a575f03 Mon Sep 17 00:00:00 2001 From: Richard Vanderpool <49568690+rvanderp3@users.noreply.github.com> Date: Wed, 11 Sep 2024 14:03:06 -0400 Subject: [PATCH 2/2] generated --- config/v1/types_infrastructure.go | 1 + ...1_infrastructures-CustomNoUpgrade.crd.yaml | 9 +++++++++ ...erator_01_infrastructures-Default.crd.yaml | 9 +++++++++ ...frastructures-DevPreviewNoUpgrade.crd.yaml | 9 +++++++++ ...rastructures-TechPreviewNoUpgrade.crd.yaml | 9 +++++++++ config/v1/zz_generated.deepcopy.go | 5 +++++ .../AAA_ungated.yaml | 9 +++++++++ .../BareMetalLoadBalancer.yaml | 9 +++++++++ .../GCPClusterHostedDNS.yaml | 9 +++++++++ .../GCPLabelsTags.yaml | 9 +++++++++ .../VSphereControlPlaneMachineSet.yaml | 9 +++++++++ .../VSphereMultiNetworks.yaml | 9 +++++++++ .../VSphereMultiVCenters.yaml | 9 +++++++++ .../v1/zz_generated.swagger_doc_generated.go | 1 + ...controllerconfigs-CustomNoUpgrade.crd.yaml | 9 +++++++++ ...nfig_01_controllerconfigs-Default.crd.yaml | 9 +++++++++ ...rollerconfigs-DevPreviewNoUpgrade.crd.yaml | 9 +++++++++ ...ollerconfigs-TechPreviewNoUpgrade.crd.yaml | 9 +++++++++ .../AAA_ungated.yaml | 9 +++++++++ .../BareMetalLoadBalancer.yaml | 9 +++++++++ .../GCPClusterHostedDNS.yaml | 9 +++++++++ .../GCPLabelsTags.yaml | 9 +++++++++ .../VSphereControlPlaneMachineSet.yaml | 9 +++++++++ .../VSphereMultiNetworks.yaml | 9 +++++++++ .../VSphereMultiVCenters.yaml | 9 +++++++++ .../generated_openapi/zz_generated.openapi.go | 20 +++++++++++++++++++ openapi/openapi.json | 9 +++++++++ ...1_infrastructures-CustomNoUpgrade.crd.yaml | 9 +++++++++ ...erator_01_infrastructures-Default.crd.yaml | 9 +++++++++ ...frastructures-DevPreviewNoUpgrade.crd.yaml | 9 +++++++++ ...rastructures-TechPreviewNoUpgrade.crd.yaml | 9 +++++++++ 31 files changed, 270 insertions(+) diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go index 319468ca9ef..5d97fa2b814 100644 --- a/config/v1/types_infrastructure.go +++ b/config/v1/types_infrastructure.go @@ -1184,6 +1184,7 @@ type VSpherePlatformFailureDomainSpec struct { // tagIDs is an optional set of tags to add to an instance. Specified tagIDs // must use URN-notation instead of display names. A maximum of 10 tag IDs may be specified. + // +listType=set // +kubebuilder:example=urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9578:GLOBAL // +optional TagIDs []string `json:"tagIDs,omitempty"` diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml index c275154261c..dcab6a5d8be 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml @@ -638,6 +638,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml index 7683c071431..b9a965f2caf 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml @@ -638,6 +638,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml index a3aae4734b7..e7bf1815172 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml @@ -638,6 +638,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml index 2f933db7987..a77b3b16f9e 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml @@ -638,6 +638,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.deepcopy.go b/config/v1/zz_generated.deepcopy.go index 06934699847..fdca9d0e4b6 100644 --- a/config/v1/zz_generated.deepcopy.go +++ b/config/v1/zz_generated.deepcopy.go @@ -5825,6 +5825,11 @@ func (in *UsernamePrefix) DeepCopy() *UsernamePrefix { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *VSpherePlatformFailureDomainSpec) DeepCopyInto(out *VSpherePlatformFailureDomainSpec) { *out = *in + if in.TagIDs != nil { + in, out := &in.TagIDs, &out.TagIDs + *out = make([]string, len(*in)) + copy(*out, *in) + } in.Topology.DeepCopyInto(&out.Topology) return } diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml index 6d5cbfd998c..4ff94164824 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml @@ -634,6 +634,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml index 238bd66eeeb..4cc1dfe18be 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml @@ -634,6 +634,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml index fb051f4ee33..b03b928464d 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml @@ -634,6 +634,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml index dfb4673a7d6..50bd4be5f44 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml @@ -634,6 +634,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml index 97dc35365c6..ef99d5fed9c 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml @@ -634,6 +634,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml index 7079549497c..a6754889ce8 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml @@ -634,6 +634,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml index 903f237aa24..030dd81ab99 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml @@ -634,6 +634,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go index c580bd8342e..f703b28e58c 100644 --- a/config/v1/zz_generated.swagger_doc_generated.go +++ b/config/v1/zz_generated.swagger_doc_generated.go @@ -1741,6 +1741,7 @@ var map_VSpherePlatformFailureDomainSpec = map[string]string{ "region": "region defines the name of a region tag that will be attached to a vCenter datacenter. The tag category in vCenter must be named openshift-region.", "zone": "zone defines the name of a zone tag that will be attached to a vCenter cluster. The tag category in vCenter must be named openshift-zone.", "server": "server is the fully-qualified domain name or the IP address of the vCenter server.", + "tagIDs": "tagIDs is an optional set of tags to add to an instance. Specified tagIDs must use URN-notation instead of display names. A maximum of 10 tag IDs may be specified.", "topology": "Topology describes a given failure domain using vSphere constructs", } diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml index 3bced7d7c55..209b864df61 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml index d806cb4c37a..b503a44eb83 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml index 76495422fc0..09a79b57312 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml index bf20e3b758b..1c033b45428 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml index bf1f5fb5114..5678747e780 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/BareMetalLoadBalancer.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/BareMetalLoadBalancer.yaml index 6fa84814fec..54f45e6c3d8 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/BareMetalLoadBalancer.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/BareMetalLoadBalancer.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml index d64eaeadde8..868f61412d5 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPLabelsTags.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPLabelsTags.yaml index 6209f61fc9c..fdc1d2b2ba2 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPLabelsTags.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPLabelsTags.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml index 5a3f50eab90..00f51289ba1 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiNetworks.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiNetworks.yaml index a3c35f29b3a..9c8a8186bbe 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiNetworks.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiNetworks.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiVCenters.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiVCenters.yaml index fd016ad74e1..30808ed4736 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiVCenters.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiVCenters.yaml @@ -916,6 +916,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags + to add to an instance. Specified tagIDs must + use URN-notation instead of display names. + A maximum of 10 tag IDs may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index 0c240f86f24..07cf7a79ae6 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -19469,6 +19469,26 @@ func schema_openshift_api_config_v1_VSpherePlatformFailureDomainSpec(ref common. Format: "", }, }, + "tagIDs": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "set", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "tagIDs is an optional set of tags to add to an instance. Specified tagIDs must use URN-notation instead of display names. A maximum of 10 tag IDs may be specified.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, "topology": { SchemaProps: spec.SchemaProps{ Description: "Topology describes a given failure domain using vSphere constructs", diff --git a/openapi/openapi.json b/openapi/openapi.json index 2f16bb27f34..c6f76214d01 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -10592,6 +10592,15 @@ "type": "string", "default": "" }, + "tagIDs": { + "description": "tagIDs is an optional set of tags to add to an instance. Specified tagIDs must use URN-notation instead of display names. A maximum of 10 tag IDs may be specified.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" + }, "topology": { "description": "Topology describes a given failure domain using vSphere constructs", "default": {}, diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml index c275154261c..dcab6a5d8be 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml @@ -638,6 +638,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml index 7683c071431..b9a965f2caf 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml @@ -638,6 +638,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml index a3aae4734b7..e7bf1815172 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml @@ -638,6 +638,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml index 2f933db7987..a77b3b16f9e 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml @@ -638,6 +638,15 @@ spec: maxLength: 255 minLength: 1 type: string + tagIDs: + description: tagIDs is an optional set of tags to add + to an instance. Specified tagIDs must use URN-notation + instead of display names. A maximum of 10 tag IDs + may be specified. + items: + type: string + type: array + x-kubernetes-list-type: set topology: description: Topology describes a given failure domain using vSphere constructs