Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1756421: bring back explain tests #24058

Merged
merged 2 commits into from
Nov 1, 2019
Merged

Bug 1756421: bring back explain tests #24058

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2756225
Revert CHECK(sttts): disables oc explain tests as our CRD are non-str…
mfojtik Oct 9, 2019
2ba8164
Add missing cases and comment out failing tests
soltysh Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
159 changes: 126 additions & 33 deletions test/extended/cli/explain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,22 @@ var (
}

crdTypes = []schema.GroupVersionResource{
{Group: "operators.coreos.com", Version: "v1", Resource: "catalogsourceconfigs"},
// FIXME:
// FIXME
// {Group: "operators.coreos.com", Version: "v1", Resource: "catalogsourceconfigs"},
// {Group: "operators.coreos.com", Version: "v1", Resource: "catalogsources"},
// {Group: "operators.coreos.com", Version: "v1", Resource: "clusterserviceversions"},
// {Group: "operators.coreos.com", Version: "v1", Resource: "installplans"},
{Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups"},
{Group: "operators.coreos.com", Version: "v1", Resource: "operatorsources"},
// FIXME:
// {Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups"},
// {Group: "operators.coreos.com", Version: "v1", Resource: "operatorsources"},
// {Group: "operators.coreos.com", Version: "v1", Resource: "subscriptions"},

{Group: "autoscaling.openshift.io", Version: "v1", Resource: "clusterautoscalers"},
// FIXME:
// FIXME
// {Group: "autoscaling.openshift.io", Version: "v1", Resource: "clusterautoscalers"},
// {Group: "autoscaling.openshift.io", Version: "v1", Resource: "machineautoscalers"},

{Group: "authorization.openshift.io", Version: "v1", Resource: "selfsubjectrulesreviews"},
{Group: "authorization.openshift.io", Version: "v1", Resource: "subjectrulesreviews"},

{Group: "config.openshift.io", Version: "v1", Resource: "apiservers"},
{Group: "config.openshift.io", Version: "v1", Resource: "authentications"},
{Group: "config.openshift.io", Version: "v1", Resource: "builds"},
Expand All @@ -68,22 +70,29 @@ var (
{Group: "config.openshift.io", Version: "v1", Resource: "ingresses"},
{Group: "config.openshift.io", Version: "v1", Resource: "networks"},
{Group: "config.openshift.io", Version: "v1", Resource: "oauths"},
{Group: "config.openshift.io", Version: "v1", Resource: "operatorhubs"},
{Group: "config.openshift.io", Version: "v1", Resource: "projects"},
{Group: "config.openshift.io", Version: "v1", Resource: "proxies"},
{Group: "config.openshift.io", Version: "v1", Resource: "schedulers"},

{Group: "cloudcredential.openshift.io", Version: "v1", Resource: "credentialsrequests"},
// FIXME
// {Group: "cloudcredential.openshift.io", Version: "v1", Resource: "credentialsrequests"},

// FIXME
// {Group: "healthchecking.openshift.io", Version: "v1", Resource: "machinehealthchecks"},
// {Group: "imageregistry.operator.openshift", Version: "v1", Resource: "configs"},

{Group: "machine.openshift.io", Version: "v1beta1", Resource: "machines"},
{Group: "machine.openshift.io", Version: "v1beta1", Resource: "machinesets"},
// FIXME
// {Group: "machine.openshift.io", Version: "v1beta1", Resource: "machinedisruptionbudgets"},
// {Group: "machine.openshift.io", Version: "v1beta1", Resource: "machinehealthchecks"},
// {Group: "machine.openshift.io", Version: "v1beta1", Resource: "machines"},
// {Group: "machine.openshift.io", Version: "v1beta1", Resource: "machinesets"},

{Group: "monitoring.coreos.com", Version: "v1", Resource: "alertmanagers"},
{Group: "monitoring.coreos.com", Version: "v1", Resource: "prometheuses"},
{Group: "monitoring.coreos.com", Version: "v1", Resource: "prometheusrules"},
{Group: "monitoring.coreos.com", Version: "v1", Resource: "servicemonitors"},
// FIXME
// {Group: "monitoring.coreos.com", Version: "v1", Resource: "alertmanagers"},
// {Group: "monitoring.coreos.com", Version: "v1", Resource: "prometheuses"},
// {Group: "monitoring.coreos.com", Version: "v1", Resource: "prometheusrules"},
// {Group: "monitoring.coreos.com", Version: "v1", Resource: "servicemonitors"},

// FIXME
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "containerruntimeconfigs"},
Expand All @@ -93,25 +102,46 @@ var (
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigs"},
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "mcoconfigs"},

{Group: "operator.openshift.io", Version: "v1", Resource: "authentications"},
{Group: "operator.openshift.io", Version: "v1alpha1", Resource: "imagecontentsourcepolicies"},

{Group: "operator.openshift.io", Version: "v1", Resource: "consoles"},
{Group: "operator.openshift.io", Version: "v1", Resource: "dnses"},
{Group: "operator.openshift.io", Version: "v1", Resource: "ingresscontrollers"},
{Group: "operator.openshift.io", Version: "v1", Resource: "kubeapiservers"},
{Group: "operator.openshift.io", Version: "v1", Resource: "kubecontrollermanagers"},
{Group: "operator.openshift.io", Version: "v1", Resource: "kubeschedulers"},
{Group: "operator.openshift.io", Version: "v1", Resource: "networks"},
{Group: "operator.openshift.io", Version: "v1", Resource: "openshiftapiservers"},
{Group: "operator.openshift.io", Version: "v1", Resource: "openshiftcontrollermanagers"},
{Group: "operator.openshift.io", Version: "v1", Resource: "servicecas"},
{Group: "operator.openshift.io", Version: "v1", Resource: "servicecatalogapiservers"},
{Group: "operator.openshift.io", Version: "v1", Resource: "servicecatalogcontrollermanagers"},

// FIXME
// {Group: "operator.openshift.io", Version: "v1", Resource: "authentications"},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

Copy link
Member

@stlaz stlaz Nov 18, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed in #24165

// {Group: "operator.openshift.io", Version: "v1", Resource: "credentialsrequestses"},
// {Group: "operator.openshift.io", Version: "v1", Resource: "ingresscontrollers"},
// {Group: "operator.openshift.io", Version: "v1", Resource: "kubeapiservers"},
// {Group: "operator.openshift.io", Version: "v1", Resource: "kubecontrollermanagers"},
// {Group: "operator.openshift.io", Version: "v1", Resource: "kubeschedulers"},
// {Group: "operator.openshift.io", Version: "v1", Resource: "networks"},
// {Group: "operator.openshift.io", Version: "v1", Resource: "openshiftcontrollermanagers"},
// {Group: "operator.openshift.io", Version: "v1", Resource: "servicecas"},
// {Group: "operator.openshift.io", Version: "v1", Resource: "servicecatalogapiservers"},
// {Group: "operator.openshift.io", Version: "v1", Resource: "servicecatalogcontrollermanagers"},

{Group: "quota.openshift.io", Version: "v1", Resource: "appliedclusterresourcequotas"},

{Group: "quota.openshift.io", Version: "v1", Resource: "clusterresourcequotas"},

{Group: "samples.operator.openshift.io", Version: "v1", Resource: "configs"},
// FIXME
// {Group: "imageregistry.operator.openshift.io", Version: "v1", Resource: "configs"},

// FIXME
// {Group: "ingress.operator.openshift.io", Version: "v1", Resource: "dnsrecords"},

// FIXME
// {Group: "samples.operator.openshift.io", Version: "v1", Resource: "configs"},

// FIXME
// {Group: "tuned.openshift.io", Version: "v1", Resource: "tuneds"},

{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"},
}

specialTypes = []explainExceptions{
Expand All @@ -127,19 +157,54 @@ var (
},
{
gv: schema.GroupVersion{Group: "authorization.openshift.io", Version: "v1"},
field: "resourceaccessreviews.resourceAPIGroup",
pattern: `FIELD\: +resourceAPIGroup`,
field: "clusterrolebindings.userNames",
pattern: `FIELD\: +userNames`,
},
{
gv: schema.GroupVersion{Group: "authorization.openshift.io", Version: "v1"},
field: "clusterroles.rules",
pattern: `FIELDS\:.*`,
},
{
gv: schema.GroupVersion{Group: "authorization.openshift.io", Version: "v1"},
field: "localresourceaccessreviews",
pattern: `FIELDS\:.*`,
},
{
gv: schema.GroupVersion{Group: "authorization.openshift.io", Version: "v1"},
field: "localsubjectaccessreviews",
pattern: `FIELDS\:.*`,
},
{
gv: schema.GroupVersion{Group: "authorization.openshift.io", Version: "v1"},
field: "resourceaccessreviews",
pattern: `FIELDS\:.*`,
},
{
gv: schema.GroupVersion{Group: "authorization.openshift.io", Version: "v1"},
field: "resourceaccessreviews.resourceAPIVersion",
pattern: `FIELD\: +resourceAPIVersion`,
field: "resourceaccessreviews",
pattern: `FIELDS\:.*`,
},
{
gv: schema.GroupVersion{Group: "authorization.openshift.io", Version: "v1"},
field: "rolebindingrestrictions.spec",
pattern: `FIELDS\:.*`,
},
{
gv: schema.GroupVersion{Group: "authorization.openshift.io", Version: "v1"},
field: "rolebindings.userNames",
pattern: `FIELD\: +userNames`,
},
{
gv: schema.GroupVersion{Group: "authorization.openshift.io", Version: "v1"},
field: "roles.rules",
pattern: `FIELDS\:.*`,
},
{
gv: schema.GroupVersion{Group: "authorization.openshift.io", Version: "v1"},
field: "subjectaccessreviews.scopes",
pattern: `FIELD\: +scopes`,
},
{
gv: schema.GroupVersion{Group: "image.openshift.io", Version: "v1"},
field: "images.dockerImageReference",
Expand Down Expand Up @@ -225,6 +290,36 @@ var (
field: "users.fullName",
pattern: `FIELD\: +fullName`,
},
{
gv: schema.GroupVersion{Group: "security.openshift.io", Version: "v1"},
field: "securitycontextconstraints",
pattern: `FIELDS\:.*`,
},
{
gv: schema.GroupVersion{Group: "console.openshift.io", Version: "v1"},
field: "consoleclidownloads.spec",
pattern: `DESCRIPTION\:.*`,
},
{
gv: schema.GroupVersion{Group: "console.openshift.io", Version: "v1"},
field: "consoleexternalloglinks.spec",
pattern: `DESCRIPTION\:.*`,
},
{
gv: schema.GroupVersion{Group: "console.openshift.io", Version: "v1"},
field: "consolelinks.spec",
pattern: `DESCRIPTION\:.*`,
},
{
gv: schema.GroupVersion{Group: "console.openshift.io", Version: "v1"},
field: "consolenotifications.spec",
pattern: `DESCRIPTION\:.*`,
},
{
gv: schema.GroupVersion{Group: "console.openshift.io", Version: "v1"},
field: "consoleyamlsamples.spec",
pattern: `DESCRIPTION\:.*`,
},
}
)

Expand All @@ -241,15 +336,13 @@ var _ = g.Describe("[cli] oc explain", func() {
})

g.It("should contain proper spec+status for CRDs", func() {
g.Skip("skipping this test as all CRDs are non-structural, please fix me!")
for _, ct := range crdTypes {
e2e.Logf("Checking %s...", ct)
o.Expect(verifyCRDSpecStatusExplain(oc, ct)).NotTo(o.HaveOccurred())
}
})

g.It("should contain proper fields description for special types", func() {
g.Skip("skipping this test as all CRDs are non-structural, please fix me!")
for _, st := range specialTypes {
e2e.Logf("Checking %s, Field=%s...", st.gv, st.field)
o.Expect(verifyExplain(oc, st.pattern, st.field, fmt.Sprintf("--api-version=%s", st.gv))).NotTo(o.HaveOccurred())
Expand Down