mirror of
https://github.com/kubernetes/client-go.git
synced 2025-08-08 18:57:24 +00:00
Merge pull request #60489 from yue9944882/remove-redundant-fake-discovery
Automatic merge from submit-queue (batch tested with PRs 59637, 60611, 60788, 60489, 60687). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
remove redundant fake discovery code
**Special notes for your reviewer**:
This PR removes fake discovery from `testing` package.
It is already moved to:
[9c57bf74b3/staging/src/k8s.io/client-go/discovery/fake/discovery.go (L34))
**Release note**:
```release-note
```
Kubernetes-commit: e2f6bd672d39d0a669bb3b58611e61808f9d2560
This commit is contained in:
Kubernetes Publisher
commit
4f2b10cdd3
106
Godeps/Godeps.json
generated
106
Godeps/Godeps.json
generated
@ -364,215 +364,215 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/fields",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/labels",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/selection",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/types",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/version",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/watch",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
|
||||
"Rev": "e9ff529c66f83aeac6dff90f11ea0c5b7c4d626a"
|
||||
"Rev": "8c70789d6211f246b21f806522b7a0f036be2978"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
|
||||
|
||||
@ -22,10 +22,7 @@ import (
|
||||
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
"k8s.io/apimachinery/pkg/version"
|
||||
"k8s.io/apimachinery/pkg/watch"
|
||||
kubeversion "k8s.io/client-go/pkg/version"
|
||||
restclient "k8s.io/client-go/rest"
|
||||
)
|
||||
|
||||
@ -214,46 +211,3 @@ func (c *Fake) Actions() []Action {
|
||||
copy(fa, c.actions)
|
||||
return fa
|
||||
}
|
||||
|
||||
// TODO: this probably should be moved to somewhere else.
|
||||
type FakeDiscovery struct {
|
||||
*Fake
|
||||
}
|
||||
|
||||
func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) {
|
||||
action := ActionImpl{
|
||||
Verb: "get",
|
||||
Resource: schema.GroupVersionResource{Resource: "resource"},
|
||||
}
|
||||
c.Invokes(action, nil)
|
||||
for _, rl := range c.Resources {
|
||||
if rl.GroupVersion == groupVersion {
|
||||
return rl, nil
|
||||
}
|
||||
}
|
||||
|
||||
return nil, fmt.Errorf("GroupVersion %q not found", groupVersion)
|
||||
}
|
||||
|
||||
func (c *FakeDiscovery) ServerResources() ([]*metav1.APIResourceList, error) {
|
||||
action := ActionImpl{
|
||||
Verb: "get",
|
||||
Resource: schema.GroupVersionResource{Resource: "resource"},
|
||||
}
|
||||
c.Invokes(action, nil)
|
||||
return c.Resources, nil
|
||||
}
|
||||
|
||||
func (c *FakeDiscovery) ServerGroups() (*metav1.APIGroupList, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (c *FakeDiscovery) ServerVersion() (*version.Info, error) {
|
||||
action := ActionImpl{}
|
||||
action.Verb = "get"
|
||||
action.Resource = schema.GroupVersionResource{Resource: "version"}
|
||||
|
||||
c.Invokes(action, nil)
|
||||
versionInfo := kubeversion.Get()
|
||||
return &versionInfo, nil
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user