From f19e2704e4cf5faa037c12e8b33f317cc56f3feb Mon Sep 17 00:00:00 2001 From: Nick Hale Date: Mon, 28 Mar 2022 12:40:53 -0400 Subject: [PATCH 1/2] vendor: update openshift/api Bump openshift/api to include types for the new operator marketplace capability. Signed-off-by: Nick Hale --- go.mod | 2 +- go.sum | 2 + ...ersion-operator_01_clusterversion.crd.yaml | 3 + ...03_config-operator_01_operatorhub.crd.yaml | 1 + ...config-operator_01_infrastructure.crd.yaml | 55 +++++++++++++++++++ ...000_10_config-operator_01_ingress.crd.yaml | 8 +-- .../0000_10_config-operator_01_node.crd.yaml | 8 +++ .../api/config/v1/types_cluster_version.go | 9 ++- .../api/config/v1/types_infrastructure.go | 45 ++++++++++++++- .../openshift/api/config/v1/types_ingress.go | 15 ++++- .../openshift/api/config/v1/types_node.go | 2 + .../api/config/v1/zz_generated.deepcopy.go | 41 +++++++++++++- .../v1/zz_generated.swagger_doc_generated.go | 24 +++++++- vendor/modules.txt | 2 +- 14 files changed, 206 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 7b51019ad..0c41226a5 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/google/go-cmp v0.5.5 github.com/google/uuid v1.1.2 github.com/imdario/mergo v0.3.8 // indirect - github.com/openshift/api v0.0.0-20220317153038-a2ca88c44400 + github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53 github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3 github.com/openshift/library-go v0.0.0-20211209153216-ed9bc958bd8a github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index d8cbdf06a..0dbefea1e 100644 --- a/go.sum +++ b/go.sum @@ -487,6 +487,8 @@ github.com/openshift/api v0.0.0-20220208222216-7e3ffb09accd h1:EaCz2jR4vZvtTBGXB github.com/openshift/api v0.0.0-20220208222216-7e3ffb09accd/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4= github.com/openshift/api v0.0.0-20220317153038-a2ca88c44400 h1:DMzrYI2PxPHFGQEWLSiHnAcF8l3wYDlGk1kUlEPhSC8= github.com/openshift/api v0.0.0-20220317153038-a2ca88c44400/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4= +github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53 h1:WpOfczPbuY5llRH94DJRsGTsgm7d8iAA2b7m0+YXAqI= +github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4= github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/build-machinery-go v0.0.0-20210806203541-4ea9b6da3a37/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= diff --git a/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml index ceb8b7e6d..24f379c13 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml @@ -65,6 +65,7 @@ spec: enum: - openshift-samples - baremetal + - marketplace x-kubernetes-list-type: atomic baselineCapabilitySet: description: baselineCapabilitySet selects an initial set of optional capabilities to enable, which can be extended via additionalEnabledCapabilities. If unset, the cluster will choose a default, and the default may change over time. The current default is vCurrent. @@ -167,6 +168,7 @@ spec: enum: - openshift-samples - baremetal + - marketplace x-kubernetes-list-type: atomic knownCapabilities: description: knownCapabilities lists all the capabilities known to the current cluster. @@ -177,6 +179,7 @@ spec: enum: - openshift-samples - baremetal + - marketplace 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/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml index 4ba6c01cf..e9895002f 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml @@ -6,6 +6,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: "marketplace" name: operatorhubs.config.openshift.io spec: group: config.openshift.io diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml index e91245de6..2d2fd7e16 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml @@ -92,6 +92,61 @@ spec: nutanix: description: Nutanix contains settings specific to the Nutanix infrastructure provider. type: object + required: + - prismCentral + - prismElements + properties: + prismCentral: + description: prismCentral holds the endpoint address and port to access the Nutanix Prism Central. When a cluster-wide proxy is installed, this endpoint will not be accessed via the proxy. + type: object + required: + - address + - port + properties: + address: + description: address is the endpoint address (DNS name or IP address) of the Nutanix Prism Central or Element (cluster) + type: string + maxLength: 256 + port: + description: port is the port number to access the Nutanix Prism Central or Element (cluster) + type: integer + format: int32 + maximum: 65535 + minimum: 1 + prismElements: + description: prismElements holds one or more endpoint address and port data to access the Nutanix Prism Elements (clusters) of the Nutanix Prism Central. Currently we only support one Prism Element (cluster) for an OpenShift cluster, where all the Nutanix resources (VMs, subnets, volumes, etc.) used in the OpenShift cluster are located. In the future, we may support Nutanix resources (VMs, etc.) spread over multiple Prism Elements (clusters) of the Prism Central. + type: array + items: + description: NutanixPrismElementEndpoint holds the name and endpoint data for a Prism Element (cluster) + type: object + required: + - endpoint + - name + properties: + endpoint: + description: endpoint holds the endpoint address and port data of the Prism Element (cluster). When a cluster-wide proxy is installed, this endpoint will not be accessed via the proxy. + type: object + required: + - address + - port + properties: + address: + description: address is the endpoint address (DNS name or IP address) of the Nutanix Prism Central or Element (cluster) + type: string + maxLength: 256 + port: + description: port is the port number to access the Nutanix Prism Central or Element (cluster) + type: integer + format: int32 + maximum: 65535 + minimum: 1 + name: + description: name is the name of the Prism Element (cluster). This value will correspond with the cluster field configured on other resources (eg Machines, PVCs, etc). + type: string + maxLength: 256 + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map openstack: description: OpenStack contains settings specific to the OpenStack infrastructure provider. type: object diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml index 95fe8dfd9..e1ecba1cb 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml @@ -53,7 +53,7 @@ spec: hostname: description: hostname is the hostname that should be used by the route. type: string - format: hostname + pattern: ^([a-zA-Z0-9\p{S}\p{L}]((-?[a-zA-Z0-9\p{S}\p{L}]{0,62})?)|([a-zA-Z0-9\p{S}\p{L}](([a-zA-Z0-9-\p{S}\p{L}]{0,61}[a-zA-Z0-9\p{S}\p{L}])?)(\.)){1,}([a-zA-Z\p{L}]){2,63})$|^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$ name: description: "name is the logical name of the route to customize. \n The namespace and name of this componentRoute must match a corresponding entry in the list of status.componentRoutes if the route is to be customized." type: string @@ -226,13 +226,13 @@ spec: type: array minItems: 1 items: - description: Hostname is an alias for hostname string validation. + description: "Hostname is an alias for hostname string validation. \n The left operand of the | is the original kubebuilder hostname validation format, which is incorrect because it allows upper case letters, disallows hyphen or number in the TLD, and allows labels to start/end in non-alphanumeric characters. See https://bugzilla.redhat.com/show_bug.cgi?id=2039256. ^([a-zA-Z0-9\\p{S}\\p{L}]((-?[a-zA-Z0-9\\p{S}\\p{L}]{0,62})?)|([a-zA-Z0-9\\p{S}\\p{L}](([a-zA-Z0-9-\\p{S}\\p{L}]{0,61}[a-zA-Z0-9\\p{S}\\p{L}])?)(\\.)){1,}([a-zA-Z\\p{L}]){2,63})$ \n The right operand of the | is a new pattern that mimics the current API route admission validation on hostname, except that it allows hostnames longer than the maximum length: ^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$ \n Both operand patterns are made available so that modifications on ingress spec can still happen after an invalid hostname was saved via validation by the incorrect left operand of the | operator." type: string - format: hostname + pattern: ^([a-zA-Z0-9\p{S}\p{L}]((-?[a-zA-Z0-9\p{S}\p{L}]{0,62})?)|([a-zA-Z0-9\p{S}\p{L}](([a-zA-Z0-9-\p{S}\p{L}]{0,61}[a-zA-Z0-9\p{S}\p{L}])?)(\.)){1,}([a-zA-Z\p{L}]){2,63})$|^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$ defaultHostname: description: defaultHostname is the hostname of this route prior to customization. type: string - format: hostname + pattern: ^([a-zA-Z0-9\p{S}\p{L}]((-?[a-zA-Z0-9\p{S}\p{L}]{0,62})?)|([a-zA-Z0-9\p{S}\p{L}](([a-zA-Z0-9-\p{S}\p{L}]{0,61}[a-zA-Z0-9\p{S}\p{L}])?)(\.)){1,}([a-zA-Z\p{L}]){2,63})$|^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$ name: description: "name is the logical name of the route to customize. It does not have to be the actual name of a route resource but it cannot be renamed. \n The namespace and name of this componentRoute must match a corresponding entry in the list of spec.componentRoutes if the route is to be customized." type: string diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_node.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_node.crd.yaml index f69c38ac3..0ca54736d 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_node.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_node.crd.yaml @@ -39,9 +39,17 @@ spec: cgroupMode: description: CgroupMode determines the cgroups version on the node type: string + enum: + - v1 + - v2 + - "" workerLatencyProfile: description: WorkerLatencyProfile determins the how fast the kubelet is updating the status and corresponding reaction of the cluster type: string + enum: + - Default + - MediumUpdateAverageReaction + - LowUpdateSlowReaction status: description: status holds observed values. type: object diff --git a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go index cd907699f..52248a68e 100644 --- a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go +++ b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go @@ -225,7 +225,7 @@ type UpdateHistory struct { type ClusterID string // ClusterVersionCapability enumerates optional, core cluster components. -// +kubebuilder:validation:Enum=openshift-samples;baremetal +// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace type ClusterVersionCapability string const ( @@ -240,6 +240,11 @@ const ( // baremetal operator which is responsible for running the metal3 // deployment. ClusterVersionCapabilityBaremetal ClusterVersionCapability = "baremetal" + + // ClusterVersionCapabilityMarketplace manages the Marketplace operator which + // supplies Operator Lifecycle Manager (OLM) users with default catalogs of + // "optional" operators. + ClusterVersionCapabilityMarketplace ClusterVersionCapability = "marketplace" ) // ClusterVersionCapabilitySet defines sets of cluster version capabilities. @@ -269,10 +274,12 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers ClusterVersionCapabilitySet4_11: { ClusterVersionCapabilityOpenShiftSamples, ClusterVersionCapabilityBaremetal, + ClusterVersionCapabilityMarketplace, }, ClusterVersionCapabilitySetCurrent: { ClusterVersionCapabilityOpenShiftSamples, ClusterVersionCapabilityBaremetal, + ClusterVersionCapabilityMarketplace, }, } diff --git a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go index 30e808c91..46ebd5827 100644 --- a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go +++ b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go @@ -705,7 +705,50 @@ type AlibabaCloudResourceTag struct { // NutanixPlatformSpec holds the desired state of the Nutanix infrastructure provider. // This only includes fields that can be modified in the cluster. -type NutanixPlatformSpec struct{} +type NutanixPlatformSpec struct { + // prismCentral holds the endpoint address and port to access the Nutanix Prism Central. + // When a cluster-wide proxy is installed, this endpoint will not be accessed via the proxy. + // +kubebuilder:validation:Required + PrismCentral NutanixPrismEndpoint `json:"prismCentral"` + + // prismElements holds one or more endpoint address and port data to access the Nutanix + // Prism Elements (clusters) of the Nutanix Prism Central. Currently we only support one + // Prism Element (cluster) for an OpenShift cluster, where all the Nutanix resources (VMs, subnets, volumes, etc.) + // used in the OpenShift cluster are located. In the future, we may support Nutanix resources (VMs, etc.) + // spread over multiple Prism Elements (clusters) of the Prism Central. + // +kubebuilder:validation:Required + // +listType=map + // +listMapKey=name + PrismElements []NutanixPrismElementEndpoint `json:"prismElements"` +} + +// NutanixPrismEndpoint holds the endpoint address and port to access the Nutanix Prism Central or Element (cluster) +type NutanixPrismEndpoint struct { + // address is the endpoint address (DNS name or IP address) of the Nutanix Prism Central or Element (cluster) + // +kubebuilder:validation:Required + // +kubebuilder:validation:MaxLength=256 + Address string `json:"address"` + + // port is the port number to access the Nutanix Prism Central or Element (cluster) + // +kubebuilder:validation:Required + // +kubebuilder:validation:Minimum=1 + // +kubebuilder:validation:Maximum=65535 + Port int32 `json:"port"` +} + +// NutanixPrismElementEndpoint holds the name and endpoint data for a Prism Element (cluster) +type NutanixPrismElementEndpoint struct { + // name is the name of the Prism Element (cluster). This value will correspond with + // the cluster field configured on other resources (eg Machines, PVCs, etc). + // +kubebuilder:validation:Required + // +kubebuilder:validation:MaxLength=256 + Name string `json:"name"` + + // endpoint holds the endpoint address and port data of the Prism Element (cluster). + // When a cluster-wide proxy is installed, this endpoint will not be accessed via the proxy. + // +kubebuilder:validation:Required + Endpoint NutanixPrismEndpoint `json:"endpoint"` +} // NutanixPlatformStatus holds the current status of the Nutanix infrastructure provider. type NutanixPlatformStatus struct { diff --git a/vendor/github.com/openshift/api/config/v1/types_ingress.go b/vendor/github.com/openshift/api/config/v1/types_ingress.go index 2c6bed3cb..9ca88efd7 100644 --- a/vendor/github.com/openshift/api/config/v1/types_ingress.go +++ b/vendor/github.com/openshift/api/config/v1/types_ingress.go @@ -91,7 +91,20 @@ type IngressSpec struct { type ConsumingUser string // Hostname is an alias for hostname string validation. -// +kubebuilder:validation:Format=hostname +// +// The left operand of the | is the original kubebuilder hostname validation format, which is incorrect because it +// allows upper case letters, disallows hyphen or number in the TLD, and allows labels to start/end in non-alphanumeric +// characters. See https://bugzilla.redhat.com/show_bug.cgi?id=2039256. +// ^([a-zA-Z0-9\p{S}\p{L}]((-?[a-zA-Z0-9\p{S}\p{L}]{0,62})?)|([a-zA-Z0-9\p{S}\p{L}](([a-zA-Z0-9-\p{S}\p{L}]{0,61}[a-zA-Z0-9\p{S}\p{L}])?)(\.)){1,}([a-zA-Z\p{L}]){2,63})$ +// +// The right operand of the | is a new pattern that mimics the current API route admission validation on hostname, +// except that it allows hostnames longer than the maximum length: +// ^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$ +// +// Both operand patterns are made available so that modifications on ingress spec can still happen after an invalid hostname +// was saved via validation by the incorrect left operand of the | operator. +// +// +kubebuilder:validation:Pattern=`^([a-zA-Z0-9\p{S}\p{L}]((-?[a-zA-Z0-9\p{S}\p{L}]{0,62})?)|([a-zA-Z0-9\p{S}\p{L}](([a-zA-Z0-9-\p{S}\p{L}]{0,61}[a-zA-Z0-9\p{S}\p{L}])?)(\.)){1,}([a-zA-Z\p{L}]){2,63})$|^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$` type Hostname string type IngressStatus struct { diff --git a/vendor/github.com/openshift/api/config/v1/types_node.go b/vendor/github.com/openshift/api/config/v1/types_node.go index b0ac483a7..573a98cf6 100644 --- a/vendor/github.com/openshift/api/config/v1/types_node.go +++ b/vendor/github.com/openshift/api/config/v1/types_node.go @@ -47,6 +47,7 @@ type NodeStatus struct { WorkerLatencyProfileStatus WorkerLatencyProfileStatus `json:"workerLatencyProfileStatus,omitempty"` } +// +kubebuilder:validation:Enum=v1;v2;"" type CgroupMode string const ( @@ -56,6 +57,7 @@ const ( CgroupModeDefault CgroupMode = CgroupModeV1 ) +// +kubebuilder:validation:Enum=Default;MediumUpdateAverageReaction;LowUpdateSlowReaction type WorkerLatencyProfileType string const ( diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go index eaec4318a..a0b2829e8 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go @@ -3350,6 +3350,12 @@ func (in *NodeStatus) DeepCopy() *NodeStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NutanixPlatformSpec) DeepCopyInto(out *NutanixPlatformSpec) { *out = *in + out.PrismCentral = in.PrismCentral + if in.PrismElements != nil { + in, out := &in.PrismElements, &out.PrismElements + *out = make([]NutanixPrismElementEndpoint, len(*in)) + copy(*out, *in) + } return } @@ -3379,6 +3385,39 @@ func (in *NutanixPlatformStatus) DeepCopy() *NutanixPlatformStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *NutanixPrismElementEndpoint) DeepCopyInto(out *NutanixPrismElementEndpoint) { + *out = *in + out.Endpoint = in.Endpoint + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NutanixPrismElementEndpoint. +func (in *NutanixPrismElementEndpoint) DeepCopy() *NutanixPrismElementEndpoint { + if in == nil { + return nil + } + out := new(NutanixPrismElementEndpoint) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *NutanixPrismEndpoint) DeepCopyInto(out *NutanixPrismEndpoint) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NutanixPrismEndpoint. +func (in *NutanixPrismEndpoint) DeepCopy() *NutanixPrismEndpoint { + if in == nil { + return nil + } + out := new(NutanixPrismEndpoint) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OAuth) DeepCopyInto(out *OAuth) { *out = *in @@ -3867,7 +3906,7 @@ func (in *PlatformSpec) DeepCopyInto(out *PlatformSpec) { if in.Nutanix != nil { in, out := &in.Nutanix, &out.Nutanix *out = new(NutanixPlatformSpec) - **out = **in + (*in).DeepCopyInto(*out) } return } diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go index 6f894f673..66d385de5 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go @@ -1205,7 +1205,9 @@ func (KubevirtPlatformStatus) SwaggerDoc() map[string]string { } var map_NutanixPlatformSpec = map[string]string{ - "": "NutanixPlatformSpec holds the desired state of the Nutanix infrastructure provider. This only includes fields that can be modified in the cluster.", + "": "NutanixPlatformSpec holds the desired state of the Nutanix infrastructure provider. This only includes fields that can be modified in the cluster.", + "prismCentral": "prismCentral holds the endpoint address and port to access the Nutanix Prism Central. When a cluster-wide proxy is installed, this endpoint will not be accessed via the proxy.", + "prismElements": "prismElements holds one or more endpoint address and port data to access the Nutanix Prism Elements (clusters) of the Nutanix Prism Central. Currently we only support one Prism Element (cluster) for an OpenShift cluster, where all the Nutanix resources (VMs, subnets, volumes, etc.) used in the OpenShift cluster are located. In the future, we may support Nutanix resources (VMs, etc.) spread over multiple Prism Elements (clusters) of the Prism Central.", } func (NutanixPlatformSpec) SwaggerDoc() map[string]string { @@ -1222,6 +1224,26 @@ func (NutanixPlatformStatus) SwaggerDoc() map[string]string { return map_NutanixPlatformStatus } +var map_NutanixPrismElementEndpoint = map[string]string{ + "": "NutanixPrismElementEndpoint holds the name and endpoint data for a Prism Element (cluster)", + "name": "name is the name of the Prism Element (cluster). This value will correspond with the cluster field configured on other resources (eg Machines, PVCs, etc).", + "endpoint": "endpoint holds the endpoint address and port data of the Prism Element (cluster). When a cluster-wide proxy is installed, this endpoint will not be accessed via the proxy.", +} + +func (NutanixPrismElementEndpoint) SwaggerDoc() map[string]string { + return map_NutanixPrismElementEndpoint +} + +var map_NutanixPrismEndpoint = map[string]string{ + "": "NutanixPrismEndpoint holds the endpoint address and port to access the Nutanix Prism Central or Element (cluster)", + "address": "address is the endpoint address (DNS name or IP address) of the Nutanix Prism Central or Element (cluster)", + "port": "port is the port number to access the Nutanix Prism Central or Element (cluster)", +} + +func (NutanixPrismEndpoint) SwaggerDoc() map[string]string { + return map_NutanixPrismEndpoint +} + var map_OpenStackPlatformSpec = map[string]string{ "": "OpenStackPlatformSpec holds the desired state of the OpenStack infrastructure provider. This only includes fields that can be modified in the cluster.", } diff --git a/vendor/modules.txt b/vendor/modules.txt index 2aa191a73..69b51445b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -61,7 +61,7 @@ github.com/modern-go/concurrent github.com/modern-go/reflect2 # github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f github.com/mwitkow/go-conntrack -# github.com/openshift/api v0.0.0-20220317153038-a2ca88c44400 +# github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53 ## explicit github.com/openshift/api/config/v1 github.com/openshift/api/image/docker10 From 2151d8d2a5c6f0badeb675e7b234a0adfda31ab3 Mon Sep 17 00:00:00 2001 From: Nick Hale Date: Mon, 28 Mar 2022 13:31:02 -0400 Subject: [PATCH 2/2] tests: add marketplace capability to unit tests Signed-off-by: Nick Hale --- lib/capability/capability_test.go | 51 +++++-- pkg/cvo/cvo_scenarios_test.go | 220 +++++++++++++++--------------- 2 files changed, 153 insertions(+), 118 deletions(-) diff --git a/lib/capability/capability_test.go b/lib/capability/capability_test.go index 12afc0794..5465ee880 100644 --- a/lib/capability/capability_test.go +++ b/lib/capability/capability_test.go @@ -33,7 +33,11 @@ func TestSetCapabilities(t *testing.T) { }, }, }, - wantKnownKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)}, + wantKnownKeys: []string{ + string(configv1.ClusterVersionCapabilityBaremetal), + string(configv1.ClusterVersionCapabilityMarketplace), + string(configv1.ClusterVersionCapabilityOpenShiftSamples), + }, wantEnabledKeys: []string{}, }, {name: "set capabilities 4_11", @@ -45,8 +49,16 @@ func TestSetCapabilities(t *testing.T) { }, }, }, - wantKnownKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)}, - wantEnabledKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)}, + wantKnownKeys: []string{ + string(configv1.ClusterVersionCapabilityBaremetal), + string(configv1.ClusterVersionCapabilityMarketplace), + string(configv1.ClusterVersionCapabilityOpenShiftSamples), + }, + wantEnabledKeys: []string{ + string(configv1.ClusterVersionCapabilityBaremetal), + string(configv1.ClusterVersionCapabilityMarketplace), + string(configv1.ClusterVersionCapabilityOpenShiftSamples), + }, }, {name: "set capabilities vCurrent", config: &configv1.ClusterVersion{ @@ -57,8 +69,16 @@ func TestSetCapabilities(t *testing.T) { }, }, }, - wantKnownKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)}, - wantEnabledKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)}, + wantKnownKeys: []string{ + string(configv1.ClusterVersionCapabilityBaremetal), + string(configv1.ClusterVersionCapabilityMarketplace), + string(configv1.ClusterVersionCapabilityOpenShiftSamples), + }, + wantEnabledKeys: []string{ + string(configv1.ClusterVersionCapabilityBaremetal), + string(configv1.ClusterVersionCapabilityMarketplace), + string(configv1.ClusterVersionCapabilityOpenShiftSamples), + }, }, {name: "set capabilities None with additional", config: &configv1.ClusterVersion{ @@ -69,7 +89,11 @@ func TestSetCapabilities(t *testing.T) { }, }, }, - wantKnownKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)}, + wantKnownKeys: []string{ + string(configv1.ClusterVersionCapabilityBaremetal), + string(configv1.ClusterVersionCapabilityMarketplace), + string(configv1.ClusterVersionCapabilityOpenShiftSamples), + }, wantEnabledKeys: []string{"cap1", "cap2", "cap3"}, }, {name: "set capabilities 4_11 with additional", @@ -81,8 +105,19 @@ func TestSetCapabilities(t *testing.T) { }, }, }, - wantKnownKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples)}, - wantEnabledKeys: []string{string(configv1.ClusterVersionCapabilityBaremetal), string(configv1.ClusterVersionCapabilityOpenShiftSamples), "cap1", "cap2", "cap3"}, + wantKnownKeys: []string{ + string(configv1.ClusterVersionCapabilityBaremetal), + string(configv1.ClusterVersionCapabilityMarketplace), + string(configv1.ClusterVersionCapabilityOpenShiftSamples), + }, + wantEnabledKeys: []string{ + string(configv1.ClusterVersionCapabilityBaremetal), + string(configv1.ClusterVersionCapabilityMarketplace), + string(configv1.ClusterVersionCapabilityOpenShiftSamples), + "cap1", + "cap2", + "cap3", + }, }, } for _, test := range tests { diff --git a/pkg/cvo/cvo_scenarios_test.go b/pkg/cvo/cvo_scenarios_test.go index 24117799c..ed6f2698d 100644 --- a/pkg/cvo/cvo_scenarios_test.go +++ b/pkg/cvo/cvo_scenarios_test.go @@ -208,8 +208,8 @@ func TestCVO_StartupAndSync(t *testing.T) { {State: configv1.PartialUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime}, }, Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, Conditions: []configv1.ClusterOperatorStatusCondition{ {Type: configv1.OperatorAvailable, Status: configv1.ConditionFalse}, @@ -263,8 +263,8 @@ func TestCVO_StartupAndSync(t *testing.T) { Release: configv1.Release{Version: "1.0.0-abc", Image: "image/image:1"}, }, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, }, SyncWorkerStatus{ @@ -287,8 +287,8 @@ func TestCVO_StartupAndSync(t *testing.T) { Release: configv1.Release{Version: "1.0.0-abc", Image: "image/image:1"}, }, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, }, SyncWorkerStatus{ @@ -311,8 +311,8 @@ func TestCVO_StartupAndSync(t *testing.T) { Release: configv1.Release{Version: "1.0.0-abc", Image: "image/image:1"}, }, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, }, SyncWorkerStatus{ @@ -336,8 +336,8 @@ func TestCVO_StartupAndSync(t *testing.T) { Release: configv1.Release{Version: "1.0.0-abc", Image: "image/image:1"}, }, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, }, ) @@ -377,8 +377,8 @@ func TestCVO_StartupAndSync(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -409,8 +409,8 @@ func TestCVO_StartupAndSync(t *testing.T) { Channels: []string{"channel-a", "channel-b", "channel-c"}, }, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -433,8 +433,8 @@ func TestCVO_StartupAndSync(t *testing.T) { }, LastProgress: time.Unix(1, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -457,8 +457,8 @@ func TestCVO_StartupAndSync(t *testing.T) { }, LastProgress: time.Unix(2, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -482,8 +482,8 @@ func TestCVO_StartupAndSync(t *testing.T) { }, LastProgress: time.Unix(3, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -606,8 +606,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { {State: configv1.PartialUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime}, }, Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, Conditions: []configv1.ClusterOperatorStatusCondition{ {Type: configv1.OperatorAvailable, Status: configv1.ConditionFalse}, @@ -658,8 +658,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { LastProgress: time.Unix(2, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -682,8 +682,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { LastProgress: time.Unix(3, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -706,8 +706,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { LastProgress: time.Unix(4, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -758,8 +758,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -790,8 +790,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { }, Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -814,8 +814,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { Generation: 1, LastProgress: time.Unix(1, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -838,8 +838,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { Generation: 1, LastProgress: time.Unix(2, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -863,8 +863,8 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) { LastProgress: time.Unix(3, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -977,8 +977,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { {State: configv1.PartialUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime}, }, Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, Conditions: []configv1.ClusterOperatorStatusCondition{ {Type: configv1.OperatorAvailable, Status: configv1.ConditionFalse}, @@ -1035,8 +1035,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { Release: configv1.Release{Version: "1.0.0-abc", Image: "image/image:1"}, }, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, }, SyncWorkerStatus{ @@ -1059,8 +1059,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { Release: configv1.Release{Version: "1.0.0-abc", Image: "image/image:1"}, }, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, }, SyncWorkerStatus{ @@ -1077,8 +1077,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { LastProgress: time.Unix(4, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -1128,8 +1128,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -1160,8 +1160,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { }, Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -1184,8 +1184,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { LastProgress: time.Unix(1, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -1208,8 +1208,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { LastProgress: time.Unix(2, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -1233,8 +1233,8 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) { LastProgress: time.Unix(3, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -1445,8 +1445,8 @@ func TestCVO_UpgradeUnverifiedPayload(t *testing.T) { }, Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -1490,8 +1490,8 @@ func TestCVO_UpgradeUnverifiedPayload(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.1-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -1702,8 +1702,8 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) { }, Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -1748,8 +1748,8 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.1-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -1780,8 +1780,8 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) { }, Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -1803,8 +1803,8 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) { Generation: 1, LastProgress: time.Unix(1, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -1826,8 +1826,8 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) { Generation: 1, LastProgress: time.Unix(2, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -1850,8 +1850,8 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) { LastProgress: time.Unix(3, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2020,8 +2020,8 @@ func TestCVO_UpgradePreconditionFailing(t *testing.T) { }, Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2042,8 +2042,8 @@ func TestCVO_UpgradePreconditionFailing(t *testing.T) { LastProgress: time.Unix(1, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2064,8 +2064,8 @@ func TestCVO_UpgradePreconditionFailing(t *testing.T) { LastProgress: time.Unix(2, 0), Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2110,8 +2110,8 @@ func TestCVO_UpgradePreconditionFailing(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.1-abc", StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -2220,8 +2220,8 @@ func TestCVO_UpgradeVerifiedPayload(t *testing.T) { {State: configv1.CompletedUpdate, Image: "image/image:0", Version: "1.0.0-abc", Verified: true, StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, }, Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, Conditions: []configv1.ClusterOperatorStatusCondition{ {Type: configv1.OperatorAvailable, Status: configv1.ConditionTrue, Message: "Done applying 1.0.0-abc"}, @@ -2349,8 +2349,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { }, LastProgress: time.Unix(2, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2372,8 +2372,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { }, LastProgress: time.Unix(3, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2395,8 +2395,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { }, LastProgress: time.Unix(4, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2436,8 +2436,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { }, LastProgress: time.Unix(1, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2458,8 +2458,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { }, LastProgress: time.Unix(2, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2481,8 +2481,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { }, LastProgress: time.Unix(3, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2504,8 +2504,8 @@ func TestCVO_RestartAndReconcile(t *testing.T) { }, LastProgress: time.Unix(4, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2660,8 +2660,8 @@ func TestCVO_ErrorDuringReconcile(t *testing.T) { Channels: []string{"channel-a", "channel-b", "channel-c"}, }, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2694,8 +2694,8 @@ func TestCVO_ErrorDuringReconcile(t *testing.T) { }, LastProgress: time.Unix(1, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2743,8 +2743,8 @@ func TestCVO_ErrorDuringReconcile(t *testing.T) { }, LastProgress: time.Unix(1, 0), CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2783,8 +2783,8 @@ func TestCVO_ErrorDuringReconcile(t *testing.T) { }, VersionHash: "DL-FFQ2Uem8=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, History: []configv1.UpdateHistory{ {State: configv1.CompletedUpdate, Image: "image/image:1", Version: "1.0.0-abc", Verified: true, StartedTime: defaultStartedTime, CompletionTime: &defaultCompletionTime}, @@ -2913,8 +2913,8 @@ func TestCVO_ParallelError(t *testing.T) { LastProgress: status.LastProgress, Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2946,8 +2946,8 @@ func TestCVO_ParallelError(t *testing.T) { LastProgress: status.LastProgress, Generation: 1, CapabilitiesStatus: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, loadPayloadStatus: LoadPayloadStatus{ Step: "PayloadLoaded", @@ -2988,8 +2988,8 @@ func TestCVO_ParallelError(t *testing.T) { Desired: configv1.Release{Version: "1.0.0-abc", Image: "image/image:1"}, VersionHash: "Gyh2W6qcDO4=", Capabilities: configv1.ClusterVersionCapabilitiesStatus{ - EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, - KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "openshift-samples"}, + EnabledCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, + KnownCapabilities: []configv1.ClusterVersionCapability{"baremetal", "marketplace", "openshift-samples"}, }, History: []configv1.UpdateHistory{ {State: configv1.PartialUpdate, Image: "image/image:1", Version: "1.0.0-abc", StartedTime: defaultStartedTime},