Skip to content

Add clusteroperators and clusterversions to explain tests #22748

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

Merged
openshift-merge-robot merged 1 commit into from
May 3, 2019
Merged

Add clusteroperators and clusterversions to explain tests #22748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions test/extended/cli/explain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,23 @@ var (
crdTypes = []schema.GroupVersionResource{
{Group: "operators.coreos.com", Version: "v1", Resource: "catalogsourceconfigs"},
// FIXME:
// schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1", Resource: "catalogsources"},
// schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1", Resource: "clusterserviceversions"},
// schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1", Resource: "installplans"},
// {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:
// schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1", Resource: "subscriptions"},
// {Group: "operators.coreos.com", Version: "v1", Resource: "subscriptions"},

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

{Group: "config.openshift.io", Version: "v1", Resource: "apiservers"},
{Group: "config.openshift.io", Version: "v1", Resource: "authentications"},
{Group: "config.openshift.io", Version: "v1", Resource: "builds"},
// fixed in https://github.com/openshift/cluster-version-operator/pull/168
// schema.GroupVersionResource{Group: "config.openshift.io", Version: "v1", Resource: "clusteroperators"},
// schema.GroupVersionResource{Group: "config.openshift.io", Version: "v1", Resource: "clusterversions"},
{Group: "config.openshift.io", Version: "v1", Resource: "clusteroperators"},
{Group: "config.openshift.io", Version: "v1", Resource: "clusterversions"},
{Group: "config.openshift.io", Version: "v1", Resource: "consoles"},
{Group: "config.openshift.io", Version: "v1", Resource: "dnses"},
{Group: "config.openshift.io", Version: "v1", Resource: "featuregates"},
Expand All @@ -75,8 +74,8 @@ var (
{Group: "cloudcredential.openshift.io", Version: "v1", Resource: "credentialsrequests"},

// FIXME
// schema.GroupVersionResource{Group: "healthchecking.openshift.io", Version: "v1", Resource: "machinehealthchecks"},
// schema.GroupVersionResource{Group: "imageregistry.operator.openshift", Version: "v1", Resource: "configs"},
// {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"},
Expand All @@ -87,12 +86,12 @@ var (
{Group: "monitoring.coreos.com", Version: "v1", Resource: "servicemonitors"},

// FIXME
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "containerruntimeconfigs"},
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "controllerconfigs"},
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "kubeletconfigs"},
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigpools"},
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigs"},
// schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "mcoconfigs"},
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "containerruntimeconfigs"},
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "controllerconfigs"},
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "kubeletconfigs"},
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigpools"},
// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigs"},
Copy link
Copy Markdown
Member

@runcom runcom May 3, 2019

Choose a reason for hiding this comment

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

I'm not sure how we can move this type to openshift/api. machineconfigs depends on Ignition which we don't control so we can't add tags for autogenerated stuff. We're moving what we can from above in openshift/api#301 but there's something which we need to understand and fix yet

Copy link
Copy Markdown
Contributor Author

@soltysh soltysh May 7, 2019

Choose a reason for hiding this comment

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

@runcom not everything needs to be in openshift/api to get it tested. The gist is to publish those information when creating those CRDs.

// {Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "mcoconfigs"},

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

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

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

{Group: "tuned.openshift.io", Version: "v1", Resource: "tuneds"},
}
Expand Down