Add additional rules for resolving ambiguity in resources.get

[fabianvf]

No description provided.

[fabianvf]

/cherry-pick release-0.10

[openshift-cherrypick-robot]

@fabianvf: once the present PR merges, I will cherry-pick it on top of release-0.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[fabianvf]

/cherry-pick release-0.9

[openshift-cherrypick-robot]

@fabianvf: once the present PR merges, I will cherry-pick it on top of release-0.9 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[fabianvf]

ping @willthames does this seem reasonable to you? There are very few resources that conflict, and for the ones that do it seems there's always one useless resource that only supports a single verb, so I think this should be a pretty harmless way to filter it. This would allow users to create openshift templates from the k8s module as well

[openshift-cherrypick-robot]

@fabianvf: new pull request created: #337

In response to this:

/cherry-pick release-0.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@fabianvf: #333 failed to apply on top of branch "release-0.9":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	openshift/dynamic/discovery.py
A	openshift/dynamic/resource.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): openshift/dynamic/resource.py deleted in HEAD and modified in Add additional rules for resolving ambiguity in resources.get. Version Add additional rules for resolving ambiguity in resources.get of openshift/dynamic/resource.py left in tree.
CONFLICT (modify/delete): openshift/dynamic/discovery.py deleted in HEAD and modified in Add additional rules for resolving ambiguity in resources.get. Version Add additional rules for resolving ambiguity in resources.get of openshift/dynamic/discovery.py left in tree.
Patch failed at 0001 Add additional rules for resolving ambiguity in resources.get

In response to this:

/cherry-pick release-0.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.