From 6809daab34f27b0df2cc3ba6d3956e16b6c6fa27 Mon Sep 17 00:00:00 2001 From: Aniket Date: Tue, 26 Nov 2019 12:17:01 -0500 Subject: [PATCH 1/2] Uncomment the lines to verify oc explain for networking related CRDs --- test/extended/cli/explain.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/extended/cli/explain.go b/test/extended/cli/explain.go index a74c3b74f87c..c88eb1bf70c7 100644 --- a/test/extended/cli/explain.go +++ b/test/extended/cli/explain.go @@ -138,12 +138,11 @@ var ( {Group: "tuned.openshift.io", Version: "v1", Resource: "tuneds"}, - // FIXME - // {Group: "network.openshift.io", Version: "v1", Resource: "clusternetworks"}, - // {Group: "network.openshift.io", Version: "v1", Resource: "egressnetworkpolicies"}, - // {Group: "network.openshift.io", Version: "v1", Resource: "hostsubnets"}, - // {Group: "network.openshift.io", Version: "v1", Resource: "netnamespaces"}, - // {Group: "network.operator.openshift.io", Version: "v1", Resource: "operatorpkis"}, + {Group: "network.openshift.io", Version: "v1", Resource: "clusternetworks"}, + {Group: "network.openshift.io", Version: "v1", Resource: "egressnetworkpolicies"}, + {Group: "network.openshift.io", Version: "v1", Resource: "hostsubnets"}, + {Group: "network.openshift.io", Version: "v1", Resource: "netnamespaces"}, + {Group: "network.operator.openshift.io", Version: "v1", Resource: "operatorpkis"}, } specialTypes = []explainExceptions{ From b3c6452047fb6ec061cc9b8fa6d50fa5f2c7944b Mon Sep 17 00:00:00 2001 From: Aniket Date: Thu, 16 Jan 2020 12:00:19 -0500 Subject: [PATCH 2/2] Move the network crds to have special case handling --- test/extended/cli/explain.go | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/test/extended/cli/explain.go b/test/extended/cli/explain.go index c88eb1bf70c7..16a7a2746421 100644 --- a/test/extended/cli/explain.go +++ b/test/extended/cli/explain.go @@ -137,12 +137,6 @@ var ( {Group: "samples.operator.openshift.io", Version: "v1", Resource: "configs"}, {Group: "tuned.openshift.io", Version: "v1", Resource: "tuneds"}, - - {Group: "network.openshift.io", Version: "v1", Resource: "clusternetworks"}, - {Group: "network.openshift.io", Version: "v1", Resource: "egressnetworkpolicies"}, - {Group: "network.openshift.io", Version: "v1", Resource: "hostsubnets"}, - {Group: "network.openshift.io", Version: "v1", Resource: "netnamespaces"}, - {Group: "network.operator.openshift.io", Version: "v1", Resource: "operatorpkis"}, } specialTypes = []explainExceptions{ @@ -321,6 +315,26 @@ var ( field: "consoleyamlsamples.spec", pattern: `DESCRIPTION\:.*`, }, + { + gv: schema.GroupVersion{Group: "network.openshift.io", Version: "v1"}, + field: "clusternetworks", + pattern: `DESCRIPTION\:.*`, + }, + { + gv: schema.GroupVersion{Group: "network.openshift.io", Version: "v1"}, + field: "hostsubnets", + pattern: `DESCRIPTION\:.*`, + }, + { + gv: schema.GroupVersion{Group: "network.openshift.io", Version: "v1"}, + field: "netnamespaces", + pattern: `DESCRIPTION\:.*`, + }, + { + gv: schema.GroupVersion{Group: "network.openshift.io", Version: "v1"}, + field: "egressnetworkpolicies", + pattern: `DESCRIPTION\:.*`, + }, } )