Skip to content

Commit 2d8cc60

Browse files
committed
feat: add conditional olm crds to explain
Signed-off-by: ehila <[email protected]>
1 parent 296b241 commit 2d8cc60

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

test/extended/cli/explain.go

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,6 @@ var (
9191
{Group: "monitoring.coreos.com", Version: "v1", Resource: "servicemonitors"},
9292
{Group: "monitoring.coreos.com", Version: "v1", Resource: "thanosrulers"},
9393

94-
{Group: "operators.coreos.com", Version: "v1", Resource: "olmconfigs"},
95-
{Group: "operators.coreos.com", Version: "v1", Resource: "operators"},
96-
{Group: "operators.coreos.com", Version: "v1", Resource: "operatorconditions"},
97-
{Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups"},
98-
99-
{Group: "operators.coreos.com", Version: "v2", Resource: "operatorconditions"},
100-
101-
{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "catalogsources"},
102-
{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "clusterserviceversions"},
103-
{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "installplans"},
104-
{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions"},
105-
{Group: "operators.coreos.com", Version: "v1alpha2", Resource: "operatorgroups"},
106-
107-
{Group: "packages.operators.coreos.com", Version: "v1", Resource: "packagemanifests"},
108-
10994
// openshift.io groups:
11095

11196
{Group: "apiserver.openshift.io", Version: "v1", Resource: "apirequestcounts"},
@@ -165,6 +150,24 @@ var (
165150

166151
{Group: "samples.operator.openshift.io", Version: "v1", Resource: "configs"},
167152
}
153+
154+
olmTypes = []schema.GroupVersionResource{
155+
{Group: "operators.coreos.com", Version: "v1", Resource: "olmconfigs"},
156+
{Group: "operators.coreos.com", Version: "v1", Resource: "operators"},
157+
{Group: "operators.coreos.com", Version: "v1", Resource: "operatorconditions"},
158+
{Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups"},
159+
160+
{Group: "operators.coreos.com", Version: "v2", Resource: "operatorconditions"},
161+
162+
{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "catalogsources"},
163+
{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "clusterserviceversions"},
164+
{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "installplans"},
165+
{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions"},
166+
{Group: "operators.coreos.com", Version: "v1alpha2", Resource: "operatorgroups"},
167+
168+
{Group: "packages.operators.coreos.com", Version: "v1", Resource: "packagemanifests"},
169+
}
170+
168171
mcoTypes = []schema.GroupVersionResource{
169172
{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "containerruntimeconfigs"},
170173
{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "controllerconfigs"},
@@ -517,6 +520,8 @@ func getCrdTypes(oc *exutil.CLI) []schema.GroupVersionResource {
517520
crdTypes = append(crdTypes, metal3Types...)
518521
case configv1.ClusterVersionCapabilityNodeTuning:
519522
crdTypes = append(crdTypes, nodeTuningTypes...)
523+
case configv1.ClusterVersionCapabilityOperatorLifecycleManager:
524+
crdTypes = append(crdTypes, olmTypes...)
520525
}
521526
}
522527
}

0 commit comments

Comments
 (0)