diff --git a/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml b/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml index 7cf29c2a848..76cdb774085 100644 --- a/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml +++ b/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml @@ -187,43 +187,15 @@ spec: description: enabledCapabilities lists all the capabilities that are currently managed. type: array items: - description: ClusterVersionCapability enumerates optional, core cluster components. + description: ClusterVersionStatusCapability enumerates optional, core cluster components, but without ClusterVersionCapability's enum. type: string - enum: - - openshift-samples - - baremetal - - marketplace - - Console - - Insights - - Storage - - CSISnapshot - - NodeTuning - - MachineAPI - - Build - - DeploymentConfig - - ImageRegistry - - OperatorLifecycleManager x-kubernetes-list-type: atomic knownCapabilities: description: knownCapabilities lists all the capabilities known to the current cluster. type: array items: - description: ClusterVersionCapability enumerates optional, core cluster components. + description: ClusterVersionStatusCapability enumerates optional, core cluster components, but without ClusterVersionCapability's enum. type: string - enum: - - openshift-samples - - baremetal - - marketplace - - Console - - Insights - - Storage - - CSISnapshot - - NodeTuning - - MachineAPI - - Build - - DeploymentConfig - - ImageRegistry - - OperatorLifecycleManager x-kubernetes-list-type: atomic conditionalUpdates: description: conditionalUpdates contains the list of updates that may be recommended for this cluster if it meets specific required conditions. Consumers interested in the set of updates that are actually recommended for this cluster should use availableUpdates. This list may be empty if no updates are recommended, if the update service is unavailable, or if an empty or invalid channel has been specified. diff --git a/config/v1/types_cluster_version.go b/config/v1/types_cluster_version.go index a9bade6fe79..1acbed69998 100644 --- a/config/v1/types_cluster_version.go +++ b/config/v1/types_cluster_version.go @@ -252,6 +252,9 @@ const ( // +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot;NodeTuning;MachineAPI;Build;DeploymentConfig;ImageRegistry;OperatorLifecycleManager type ClusterVersionCapability string +// ClusterVersionStatusCapability enumerates optional, core cluster components, but without ClusterVersionCapability's enum. +type ClusterVersionStatusCapability string + const ( // ClusterVersionCapabilityOpenShiftSamples manages the sample // image streams and templates stored in the openshift @@ -489,12 +492,12 @@ type ClusterVersionCapabilitiesStatus struct { // enabledCapabilities lists all the capabilities that are currently managed. // +listType=atomic // +optional - EnabledCapabilities []ClusterVersionCapability `json:"enabledCapabilities,omitempty"` + EnabledCapabilities []ClusterVersionStatusCapability `json:"enabledCapabilities,omitempty"` // knownCapabilities lists all the capabilities known to the current cluster. // +listType=atomic // +optional - KnownCapabilities []ClusterVersionCapability `json:"knownCapabilities,omitempty"` + KnownCapabilities []ClusterVersionStatusCapability `json:"knownCapabilities,omitempty"` } // ComponentOverride allows overriding cluster version operator's behavior diff --git a/config/v1/zz_generated.deepcopy.go b/config/v1/zz_generated.deepcopy.go index 63b9f050d00..e803fdb50ba 100644 --- a/config/v1/zz_generated.deepcopy.go +++ b/config/v1/zz_generated.deepcopy.go @@ -1110,12 +1110,12 @@ func (in *ClusterVersionCapabilitiesStatus) DeepCopyInto(out *ClusterVersionCapa *out = *in if in.EnabledCapabilities != nil { in, out := &in.EnabledCapabilities, &out.EnabledCapabilities - *out = make([]ClusterVersionCapability, len(*in)) + *out = make([]ClusterVersionStatusCapability, len(*in)) copy(*out, *in) } if in.KnownCapabilities != nil { in, out := &in.KnownCapabilities, &out.KnownCapabilities - *out = make([]ClusterVersionCapability, len(*in)) + *out = make([]ClusterVersionStatusCapability, len(*in)) copy(*out, *in) } return