github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84921 from clarklee92/FixCollidesWithImportedPackageName

Browse Source 
Variables collide with imported package name
This commit is contained in:
Kubernetes Prow Robot 2019-11-28 01:49:03 -08:00 committed by GitHub
commit d356fcfce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/registry/core/pod/storage/storage.go
View File

@ -42,7 +42,7 @@ import (
"k8s.io/kubernetes/pkg/printers" "k8s.io/kubernetes/pkg/printers"
printersinternal "k8s.io/kubernetes/pkg/printers/internalversion" printersinternal "k8s.io/kubernetes/pkg/printers/internalversion"
printerstorage "k8s.io/kubernetes/pkg/printers/storage" printerstorage "k8s.io/kubernetes/pkg/printers/storage"
"k8s.io/kubernetes/pkg/registry/core/pod" registrypod "k8s.io/kubernetes/pkg/registry/core/pod"
podrest "k8s.io/kubernetes/pkg/registry/core/pod/rest" podrest "k8s.io/kubernetes/pkg/registry/core/pod/rest"
) )
@ -73,29 +73,29 @@ func NewStorage(optsGetter generic.RESTOptionsGetter, k client.ConnectionInfoGet
store := &genericregistry.Store{ store := &genericregistry.Store{
NewFunc: func() runtime.Object { return &api.Pod{} }, NewFunc: func() runtime.Object { return &api.Pod{} },
NewListFunc: func() runtime.Object { return &api.PodList{} }, NewListFunc: func() runtime.Object { return &api.PodList{} },
PredicateFunc: pod.MatchPod, PredicateFunc: registrypod.MatchPod,
DefaultQualifiedResource: api.Resource("pods"), DefaultQualifiedResource: api.Resource("pods"),
CreateStrategy: pod.Strategy, CreateStrategy: registrypod.Strategy,
UpdateStrategy: pod.Strategy, UpdateStrategy: registrypod.Strategy,
DeleteStrategy: pod.Strategy, DeleteStrategy: registrypod.Strategy,
ReturnDeletedObject: true, ReturnDeletedObject: true,
TableConvertor: printerstorage.TableConvertor{TableGenerator: printers.NewTableGenerator().With(printersinternal.AddHandlers)}, TableConvertor: printerstorage.TableConvertor{TableGenerator: printers.NewTableGenerator().With(printersinternal.AddHandlers)},
} }
options := &generic.StoreOptions{ options := &generic.StoreOptions{
RESTOptions: optsGetter, RESTOptions: optsGetter,
AttrFunc: pod.GetAttrs, AttrFunc: registrypod.GetAttrs,
TriggerFunc: map[string]storage.IndexerFunc{"spec.nodeName": pod.NodeNameTriggerFunc}, TriggerFunc: map[string]storage.IndexerFunc{"spec.nodeName": registrypod.NodeNameTriggerFunc},
} }
if err := store.CompleteWithOptions(options); err != nil { if err := store.CompleteWithOptions(options); err != nil {
return PodStorage{}, err return PodStorage{}, err
} }
statusStore := *store statusStore := *store
statusStore.UpdateStrategy = pod.StatusStrategy statusStore.UpdateStrategy = registrypod.StatusStrategy
ephemeralContainersStore := *store ephemeralContainersStore := *store
ephemeralContainersStore.UpdateStrategy = pod.EphemeralContainersStrategy ephemeralContainersStore.UpdateStrategy = registrypod.EphemeralContainersStrategy
bindingREST := &BindingREST{store: store} bindingREST := &BindingREST{store: store}
return PodStorage{ return PodStorage{
@ -118,7 +118,7 @@ var _ = rest.Redirector(&REST{})
// ResourceLocation returns a pods location from its HostIP // ResourceLocation returns a pods location from its HostIP
func (r *REST) ResourceLocation(ctx context.Context, name string) (*url.URL, http.RoundTripper, error) { func (r *REST) ResourceLocation(ctx context.Context, name string) (*url.URL, http.RoundTripper, error) {
return pod.ResourceLocation(r, r.proxyTransport, ctx, name) return registrypod.ResourceLocation(r, r.proxyTransport, ctx, name)
} }
// Implement ShortNamesProvider // Implement ShortNamesProvider

8
pkg/registry/core/pod/storage/storage_test.go
View File

@ -36,7 +36,7 @@ import (
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
"k8s.io/apiserver/pkg/storage" apiserverstorage "k8s.io/apiserver/pkg/storage"
storeerr "k8s.io/apiserver/pkg/storage/errors" storeerr "k8s.io/apiserver/pkg/storage/errors"
etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
@ -155,13 +155,13 @@ func TestDelete(t *testing.T) {
} }
type FailDeletionStorage struct { type FailDeletionStorage struct {
storage.Interface apiserverstorage.Interface
Called *bool Called *bool
} }
func (f FailDeletionStorage) Delete(ctx context.Context, key string, out runtime.Object, precondition *storage.Preconditions, _ storage.ValidateObjectFunc) error { func (f FailDeletionStorage) Delete(ctx context.Context, key string, out runtime.Object, precondition *apiserverstorage.Preconditions, _ apiserverstorage.ValidateObjectFunc) error {
*f.Called = true *f.Called = true
return storage.NewKeyNotFoundError(key, 0) return apiserverstorage.NewKeyNotFoundError(key, 0)
} }
func newFailDeleteStorage(t *testing.T, called *bool) (*REST, *etcd3testing.EtcdTestServer) { func newFailDeleteStorage(t *testing.T, called *bool) (*REST, *etcd3testing.EtcdTestServer) {