Skip to content

Commit 4a950b0

Browse files
Merge pull request #22748 from soltysh/e2e_explain_followup
Add clusteroperators and clusterversions to explain tests
2 parents c610712 + 32bdfde commit 4a950b0

1 file changed

Lines changed: 16 additions & 17 deletions

File tree

test/extended/cli/explain.go

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,23 @@ var (
4343
crdTypes = []schema.GroupVersionResource{
4444
{Group: "operators.coreos.com", Version: "v1", Resource: "catalogsourceconfigs"},
4545
// FIXME:
46-
// schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1", Resource: "catalogsources"},
47-
// schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1", Resource: "clusterserviceversions"},
48-
// schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1", Resource: "installplans"},
46+
// {Group: "operators.coreos.com", Version: "v1", Resource: "catalogsources"},
47+
// {Group: "operators.coreos.com", Version: "v1", Resource: "clusterserviceversions"},
48+
// {Group: "operators.coreos.com", Version: "v1", Resource: "installplans"},
4949
{Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups"},
5050
{Group: "operators.coreos.com", Version: "v1", Resource: "operatorsources"},
5151
// FIXME:
52-
// schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1", Resource: "subscriptions"},
52+
// {Group: "operators.coreos.com", Version: "v1", Resource: "subscriptions"},
5353

5454
{Group: "autoscaling.openshift.io", Version: "v1", Resource: "clusterautoscalers"},
5555
// FIXME:
56-
// schema.GroupVersionResource{Group: "autoscaling.openshift.io", Version: "v1", Resource: "machineautoscalers"},
56+
// {Group: "autoscaling.openshift.io", Version: "v1", Resource: "machineautoscalers"},
5757

5858
{Group: "config.openshift.io", Version: "v1", Resource: "apiservers"},
5959
{Group: "config.openshift.io", Version: "v1", Resource: "authentications"},
6060
{Group: "config.openshift.io", Version: "v1", Resource: "builds"},
61-
// fixed in https://github.com/openshift/cluster-version-operator/pull/168
62-
// schema.GroupVersionResource{Group: "config.openshift.io", Version: "v1", Resource: "clusteroperators"},
63-
// schema.GroupVersionResource{Group: "config.openshift.io", Version: "v1", Resource: "clusterversions"},
61+
{Group: "config.openshift.io", Version: "v1", Resource: "clusteroperators"},
62+
{Group: "config.openshift.io", Version: "v1", Resource: "clusterversions"},
6463
{Group: "config.openshift.io", Version: "v1", Resource: "consoles"},
6564
{Group: "config.openshift.io", Version: "v1", Resource: "dnses"},
6665
{Group: "config.openshift.io", Version: "v1", Resource: "featuregates"},
@@ -75,8 +74,8 @@ var (
7574
{Group: "cloudcredential.openshift.io", Version: "v1", Resource: "credentialsrequests"},
7675

7776
// FIXME
78-
// schema.GroupVersionResource{Group: "healthchecking.openshift.io", Version: "v1", Resource: "machinehealthchecks"},
79-
// schema.GroupVersionResource{Group: "imageregistry.operator.openshift", Version: "v1", Resource: "configs"},
77+
// {Group: "healthchecking.openshift.io", Version: "v1", Resource: "machinehealthchecks"},
78+
// {Group: "imageregistry.operator.openshift", Version: "v1", Resource: "configs"},
8079

8180
{Group: "machine.openshift.io", Version: "v1beta1", Resource: "machines"},
8281
{Group: "machine.openshift.io", Version: "v1beta1", Resource: "machinesets"},
@@ -87,12 +86,12 @@ var (
8786
{Group: "monitoring.coreos.com", Version: "v1", Resource: "servicemonitors"},
8887

8988
// FIXME
90-
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "containerruntimeconfigs"},
91-
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "controllerconfigs"},
92-
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "kubeletconfigs"},
93-
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigpools"},
94-
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigs"},
95-
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "mcoconfigs"},
89+
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "containerruntimeconfigs"},
90+
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "controllerconfigs"},
91+
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "kubeletconfigs"},
92+
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigpools"},
93+
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigs"},
94+
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "mcoconfigs"},
9695

9796
{Group: "network.openshift.io", Version: "v1", Resource: "egressnetworkpolicies"},
9897

@@ -113,7 +112,7 @@ var (
113112
{Group: "quota.openshift.io", Version: "v1", Resource: "clusterresourcequotas"},
114113

115114
// FIXME
116-
// schema.GroupVersionResource{Group: "samples.operator.openshift.io", Version: "v1", Resource: "configs"},
115+
// {Group: "samples.operator.openshift.io", Version: "v1", Resource: "configs"},
117116

118117
{Group: "tuned.openshift.io", Version: "v1", Resource: "tuneds"},
119118
}

0 commit comments

Comments
 (0)