diff --git a/pkg/authorization/generated/listers/authorization/internalversion/clusterpolicy.go b/pkg/authorization/generated/listers/authorization/internalversion/clusterpolicy.go index 0ec166243c1f..5058bb710a89 100644 --- a/pkg/authorization/generated/listers/authorization/internalversion/clusterpolicy.go +++ b/pkg/authorization/generated/listers/authorization/internalversion/clusterpolicy.go @@ -5,7 +5,6 @@ package internalversion import ( authorization "github.com/openshift/origin/pkg/authorization/apis/authorization" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterPolicyLister) List(selector labels.Selector) (ret []*authorizati // Get retrieves the ClusterPolicy from the index for a given name. func (s *clusterPolicyLister) Get(name string) (*authorization.ClusterPolicy, error) { - key := &authorization.ClusterPolicy{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/authorization/generated/listers/authorization/internalversion/clusterpolicybinding.go b/pkg/authorization/generated/listers/authorization/internalversion/clusterpolicybinding.go index 73a7af1c1248..dc180e30391c 100644 --- a/pkg/authorization/generated/listers/authorization/internalversion/clusterpolicybinding.go +++ b/pkg/authorization/generated/listers/authorization/internalversion/clusterpolicybinding.go @@ -5,7 +5,6 @@ package internalversion import ( authorization "github.com/openshift/origin/pkg/authorization/apis/authorization" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterPolicyBindingLister) List(selector labels.Selector) (ret []*auth // Get retrieves the ClusterPolicyBinding from the index for a given name. func (s *clusterPolicyBindingLister) Get(name string) (*authorization.ClusterPolicyBinding, error) { - key := &authorization.ClusterPolicyBinding{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/authorization/generated/listers/authorization/internalversion/clusterrole.go b/pkg/authorization/generated/listers/authorization/internalversion/clusterrole.go index 271f729fe035..34cabb061cf6 100644 --- a/pkg/authorization/generated/listers/authorization/internalversion/clusterrole.go +++ b/pkg/authorization/generated/listers/authorization/internalversion/clusterrole.go @@ -5,7 +5,6 @@ package internalversion import ( authorization "github.com/openshift/origin/pkg/authorization/apis/authorization" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterRoleLister) List(selector labels.Selector) (ret []*authorization // Get retrieves the ClusterRole from the index for a given name. func (s *clusterRoleLister) Get(name string) (*authorization.ClusterRole, error) { - key := &authorization.ClusterRole{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/authorization/generated/listers/authorization/internalversion/clusterrolebinding.go b/pkg/authorization/generated/listers/authorization/internalversion/clusterrolebinding.go index 478b2e33ff02..362c8a149424 100644 --- a/pkg/authorization/generated/listers/authorization/internalversion/clusterrolebinding.go +++ b/pkg/authorization/generated/listers/authorization/internalversion/clusterrolebinding.go @@ -5,7 +5,6 @@ package internalversion import ( authorization "github.com/openshift/origin/pkg/authorization/apis/authorization" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterRoleBindingLister) List(selector labels.Selector) (ret []*author // Get retrieves the ClusterRoleBinding from the index for a given name. func (s *clusterRoleBindingLister) Get(name string) (*authorization.ClusterRoleBinding, error) { - key := &authorization.ClusterRoleBinding{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/authorization/generated/listers/authorization/v1/clusterpolicy.go b/pkg/authorization/generated/listers/authorization/v1/clusterpolicy.go index edbef04ff19e..1f89dc68b28e 100644 --- a/pkg/authorization/generated/listers/authorization/v1/clusterpolicy.go +++ b/pkg/authorization/generated/listers/authorization/v1/clusterpolicy.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterPolicyLister) List(selector labels.Selector) (ret []*v1.ClusterP // Get retrieves the ClusterPolicy from the index for a given name. func (s *clusterPolicyLister) Get(name string) (*v1.ClusterPolicy, error) { - key := &v1.ClusterPolicy{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/authorization/generated/listers/authorization/v1/clusterpolicybinding.go b/pkg/authorization/generated/listers/authorization/v1/clusterpolicybinding.go index 3fb61f9bdfd1..094ae58153b7 100644 --- a/pkg/authorization/generated/listers/authorization/v1/clusterpolicybinding.go +++ b/pkg/authorization/generated/listers/authorization/v1/clusterpolicybinding.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterPolicyBindingLister) List(selector labels.Selector) (ret []*v1.C // Get retrieves the ClusterPolicyBinding from the index for a given name. func (s *clusterPolicyBindingLister) Get(name string) (*v1.ClusterPolicyBinding, error) { - key := &v1.ClusterPolicyBinding{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/authorization/generated/listers/authorization/v1/clusterrole.go b/pkg/authorization/generated/listers/authorization/v1/clusterrole.go index f8d5ab330474..e26f772eeb7f 100644 --- a/pkg/authorization/generated/listers/authorization/v1/clusterrole.go +++ b/pkg/authorization/generated/listers/authorization/v1/clusterrole.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterRoleLister) List(selector labels.Selector) (ret []*v1.ClusterRol // Get retrieves the ClusterRole from the index for a given name. func (s *clusterRoleLister) Get(name string) (*v1.ClusterRole, error) { - key := &v1.ClusterRole{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/authorization/generated/listers/authorization/v1/clusterrolebinding.go b/pkg/authorization/generated/listers/authorization/v1/clusterrolebinding.go index 8e7bfe5ba6cd..a04678f2bfa4 100644 --- a/pkg/authorization/generated/listers/authorization/v1/clusterrolebinding.go +++ b/pkg/authorization/generated/listers/authorization/v1/clusterrolebinding.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterRoleBindingLister) List(selector labels.Selector) (ret []*v1.Clu // Get retrieves the ClusterRoleBinding from the index for a given name. func (s *clusterRoleBindingLister) Get(name string) (*v1.ClusterRoleBinding, error) { - key := &v1.ClusterRoleBinding{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/image/generated/listers/image/internalversion/image.go b/pkg/image/generated/listers/image/internalversion/image.go index 5ab4fb9054c5..79e62ae6c45d 100644 --- a/pkg/image/generated/listers/image/internalversion/image.go +++ b/pkg/image/generated/listers/image/internalversion/image.go @@ -5,7 +5,6 @@ package internalversion import ( image "github.com/openshift/origin/pkg/image/apis/image" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *imageLister) List(selector labels.Selector) (ret []*image.Image, err er // Get retrieves the Image from the index for a given name. func (s *imageLister) Get(name string) (*image.Image, error) { - key := &image.Image{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/image/generated/listers/image/v1/image.go b/pkg/image/generated/listers/image/v1/image.go index b5d10313a86c..3ee0d93c553c 100644 --- a/pkg/image/generated/listers/image/v1/image.go +++ b/pkg/image/generated/listers/image/v1/image.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/image/apis/image/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *imageLister) List(selector labels.Selector) (ret []*v1.Image, err error // Get retrieves the Image from the index for a given name. func (s *imageLister) Get(name string) (*v1.Image, error) { - key := &v1.Image{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/network/generated/listers/network/internalversion/clusternetwork.go b/pkg/network/generated/listers/network/internalversion/clusternetwork.go index 9b7675c7aea4..5572202ce72a 100644 --- a/pkg/network/generated/listers/network/internalversion/clusternetwork.go +++ b/pkg/network/generated/listers/network/internalversion/clusternetwork.go @@ -5,7 +5,6 @@ package internalversion import ( network "github.com/openshift/origin/pkg/network/apis/network" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterNetworkLister) List(selector labels.Selector) (ret []*network.Cl // Get retrieves the ClusterNetwork from the index for a given name. func (s *clusterNetworkLister) Get(name string) (*network.ClusterNetwork, error) { - key := &network.ClusterNetwork{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/network/generated/listers/network/internalversion/hostsubnet.go b/pkg/network/generated/listers/network/internalversion/hostsubnet.go index 15834f5b19ae..4c7e1dcec1bb 100644 --- a/pkg/network/generated/listers/network/internalversion/hostsubnet.go +++ b/pkg/network/generated/listers/network/internalversion/hostsubnet.go @@ -5,7 +5,6 @@ package internalversion import ( network "github.com/openshift/origin/pkg/network/apis/network" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *hostSubnetLister) List(selector labels.Selector) (ret []*network.HostSu // Get retrieves the HostSubnet from the index for a given name. func (s *hostSubnetLister) Get(name string) (*network.HostSubnet, error) { - key := &network.HostSubnet{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/network/generated/listers/network/internalversion/netnamespace.go b/pkg/network/generated/listers/network/internalversion/netnamespace.go index bf10374614fd..6550ff22de7a 100644 --- a/pkg/network/generated/listers/network/internalversion/netnamespace.go +++ b/pkg/network/generated/listers/network/internalversion/netnamespace.go @@ -5,7 +5,6 @@ package internalversion import ( network "github.com/openshift/origin/pkg/network/apis/network" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *netNamespaceLister) List(selector labels.Selector) (ret []*network.NetN // Get retrieves the NetNamespace from the index for a given name. func (s *netNamespaceLister) Get(name string) (*network.NetNamespace, error) { - key := &network.NetNamespace{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/network/generated/listers/network/v1/clusternetwork.go b/pkg/network/generated/listers/network/v1/clusternetwork.go index ab53a87e6b23..2f5dcc9c2ee4 100644 --- a/pkg/network/generated/listers/network/v1/clusternetwork.go +++ b/pkg/network/generated/listers/network/v1/clusternetwork.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/network/apis/network/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterNetworkLister) List(selector labels.Selector) (ret []*v1.Cluster // Get retrieves the ClusterNetwork from the index for a given name. func (s *clusterNetworkLister) Get(name string) (*v1.ClusterNetwork, error) { - key := &v1.ClusterNetwork{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/network/generated/listers/network/v1/hostsubnet.go b/pkg/network/generated/listers/network/v1/hostsubnet.go index d6a287c10ddb..d56724d7f470 100644 --- a/pkg/network/generated/listers/network/v1/hostsubnet.go +++ b/pkg/network/generated/listers/network/v1/hostsubnet.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/network/apis/network/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *hostSubnetLister) List(selector labels.Selector) (ret []*v1.HostSubnet, // Get retrieves the HostSubnet from the index for a given name. func (s *hostSubnetLister) Get(name string) (*v1.HostSubnet, error) { - key := &v1.HostSubnet{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/network/generated/listers/network/v1/netnamespace.go b/pkg/network/generated/listers/network/v1/netnamespace.go index 5fe52fb95446..0abca93964cb 100644 --- a/pkg/network/generated/listers/network/v1/netnamespace.go +++ b/pkg/network/generated/listers/network/v1/netnamespace.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/network/apis/network/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *netNamespaceLister) List(selector labels.Selector) (ret []*v1.NetNamesp // Get retrieves the NetNamespace from the index for a given name. func (s *netNamespaceLister) Get(name string) (*v1.NetNamespace, error) { - key := &v1.NetNamespace{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/oauth/generated/listers/oauth/internalversion/oauthaccesstoken.go b/pkg/oauth/generated/listers/oauth/internalversion/oauthaccesstoken.go index e0ad042c04d8..62915c195136 100644 --- a/pkg/oauth/generated/listers/oauth/internalversion/oauthaccesstoken.go +++ b/pkg/oauth/generated/listers/oauth/internalversion/oauthaccesstoken.go @@ -5,7 +5,6 @@ package internalversion import ( oauth "github.com/openshift/origin/pkg/oauth/apis/oauth" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *oAuthAccessTokenLister) List(selector labels.Selector) (ret []*oauth.OA // Get retrieves the OAuthAccessToken from the index for a given name. func (s *oAuthAccessTokenLister) Get(name string) (*oauth.OAuthAccessToken, error) { - key := &oauth.OAuthAccessToken{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/oauth/generated/listers/oauth/internalversion/oauthauthorizetoken.go b/pkg/oauth/generated/listers/oauth/internalversion/oauthauthorizetoken.go index 9c5c60a874c2..437c9869feb9 100644 --- a/pkg/oauth/generated/listers/oauth/internalversion/oauthauthorizetoken.go +++ b/pkg/oauth/generated/listers/oauth/internalversion/oauthauthorizetoken.go @@ -5,7 +5,6 @@ package internalversion import ( oauth "github.com/openshift/origin/pkg/oauth/apis/oauth" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *oAuthAuthorizeTokenLister) List(selector labels.Selector) (ret []*oauth // Get retrieves the OAuthAuthorizeToken from the index for a given name. func (s *oAuthAuthorizeTokenLister) Get(name string) (*oauth.OAuthAuthorizeToken, error) { - key := &oauth.OAuthAuthorizeToken{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/oauth/generated/listers/oauth/internalversion/oauthclient.go b/pkg/oauth/generated/listers/oauth/internalversion/oauthclient.go index b8a04574be89..308f15f9f0c4 100644 --- a/pkg/oauth/generated/listers/oauth/internalversion/oauthclient.go +++ b/pkg/oauth/generated/listers/oauth/internalversion/oauthclient.go @@ -5,7 +5,6 @@ package internalversion import ( oauth "github.com/openshift/origin/pkg/oauth/apis/oauth" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *oAuthClientLister) List(selector labels.Selector) (ret []*oauth.OAuthCl // Get retrieves the OAuthClient from the index for a given name. func (s *oAuthClientLister) Get(name string) (*oauth.OAuthClient, error) { - key := &oauth.OAuthClient{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/oauth/generated/listers/oauth/internalversion/oauthclientauthorization.go b/pkg/oauth/generated/listers/oauth/internalversion/oauthclientauthorization.go index b6739f2d9ae4..6d10fa6854c7 100644 --- a/pkg/oauth/generated/listers/oauth/internalversion/oauthclientauthorization.go +++ b/pkg/oauth/generated/listers/oauth/internalversion/oauthclientauthorization.go @@ -5,7 +5,6 @@ package internalversion import ( oauth "github.com/openshift/origin/pkg/oauth/apis/oauth" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *oAuthClientAuthorizationLister) List(selector labels.Selector) (ret []* // Get retrieves the OAuthClientAuthorization from the index for a given name. func (s *oAuthClientAuthorizationLister) Get(name string) (*oauth.OAuthClientAuthorization, error) { - key := &oauth.OAuthClientAuthorization{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/oauth/generated/listers/oauth/v1/oauthaccesstoken.go b/pkg/oauth/generated/listers/oauth/v1/oauthaccesstoken.go index ad789d76c3fc..f52e77efcfb2 100644 --- a/pkg/oauth/generated/listers/oauth/v1/oauthaccesstoken.go +++ b/pkg/oauth/generated/listers/oauth/v1/oauthaccesstoken.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/oauth/apis/oauth/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *oAuthAccessTokenLister) List(selector labels.Selector) (ret []*v1.OAuth // Get retrieves the OAuthAccessToken from the index for a given name. func (s *oAuthAccessTokenLister) Get(name string) (*v1.OAuthAccessToken, error) { - key := &v1.OAuthAccessToken{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/oauth/generated/listers/oauth/v1/oauthauthorizetoken.go b/pkg/oauth/generated/listers/oauth/v1/oauthauthorizetoken.go index 4e4d8972e038..34b212a0f0a0 100644 --- a/pkg/oauth/generated/listers/oauth/v1/oauthauthorizetoken.go +++ b/pkg/oauth/generated/listers/oauth/v1/oauthauthorizetoken.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/oauth/apis/oauth/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *oAuthAuthorizeTokenLister) List(selector labels.Selector) (ret []*v1.OA // Get retrieves the OAuthAuthorizeToken from the index for a given name. func (s *oAuthAuthorizeTokenLister) Get(name string) (*v1.OAuthAuthorizeToken, error) { - key := &v1.OAuthAuthorizeToken{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/oauth/generated/listers/oauth/v1/oauthclient.go b/pkg/oauth/generated/listers/oauth/v1/oauthclient.go index 94307a5af5ed..bdcccd39dea8 100644 --- a/pkg/oauth/generated/listers/oauth/v1/oauthclient.go +++ b/pkg/oauth/generated/listers/oauth/v1/oauthclient.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/oauth/apis/oauth/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *oAuthClientLister) List(selector labels.Selector) (ret []*v1.OAuthClien // Get retrieves the OAuthClient from the index for a given name. func (s *oAuthClientLister) Get(name string) (*v1.OAuthClient, error) { - key := &v1.OAuthClient{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/oauth/generated/listers/oauth/v1/oauthclientauthorization.go b/pkg/oauth/generated/listers/oauth/v1/oauthclientauthorization.go index 4730a2473231..b366b40b8362 100644 --- a/pkg/oauth/generated/listers/oauth/v1/oauthclientauthorization.go +++ b/pkg/oauth/generated/listers/oauth/v1/oauthclientauthorization.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/oauth/apis/oauth/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *oAuthClientAuthorizationLister) List(selector labels.Selector) (ret []* // Get retrieves the OAuthClientAuthorization from the index for a given name. func (s *oAuthClientAuthorizationLister) Get(name string) (*v1.OAuthClientAuthorization, error) { - key := &v1.OAuthClientAuthorization{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/project/generated/listers/project/internalversion/project.go b/pkg/project/generated/listers/project/internalversion/project.go index 707ceacce3b7..4cd88b26e98d 100644 --- a/pkg/project/generated/listers/project/internalversion/project.go +++ b/pkg/project/generated/listers/project/internalversion/project.go @@ -5,7 +5,6 @@ package internalversion import ( project "github.com/openshift/origin/pkg/project/apis/project" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *projectLister) List(selector labels.Selector) (ret []*project.Project, // Get retrieves the Project from the index for a given name. func (s *projectLister) Get(name string) (*project.Project, error) { - key := &project.Project{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/project/generated/listers/project/v1/project.go b/pkg/project/generated/listers/project/v1/project.go index 709d7b93ec95..96d720064a06 100644 --- a/pkg/project/generated/listers/project/v1/project.go +++ b/pkg/project/generated/listers/project/v1/project.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/project/apis/project/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *projectLister) List(selector labels.Selector) (ret []*v1.Project, err e // Get retrieves the Project from the index for a given name. func (s *projectLister) Get(name string) (*v1.Project, error) { - key := &v1.Project{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/quota/generated/listers/quota/internalversion/clusterresourcequota.go b/pkg/quota/generated/listers/quota/internalversion/clusterresourcequota.go index 93d8255593e5..a7cc5f596412 100644 --- a/pkg/quota/generated/listers/quota/internalversion/clusterresourcequota.go +++ b/pkg/quota/generated/listers/quota/internalversion/clusterresourcequota.go @@ -5,7 +5,6 @@ package internalversion import ( quota "github.com/openshift/origin/pkg/quota/apis/quota" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterResourceQuotaLister) List(selector labels.Selector) (ret []*quot // Get retrieves the ClusterResourceQuota from the index for a given name. func (s *clusterResourceQuotaLister) Get(name string) (*quota.ClusterResourceQuota, error) { - key := "a.ClusterResourceQuota{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/quota/generated/listers/quota/v1/clusterresourcequota.go b/pkg/quota/generated/listers/quota/v1/clusterresourcequota.go index 976f85bf1866..ab3e9ac49d20 100644 --- a/pkg/quota/generated/listers/quota/v1/clusterresourcequota.go +++ b/pkg/quota/generated/listers/quota/v1/clusterresourcequota.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/quota/apis/quota/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *clusterResourceQuotaLister) List(selector labels.Selector) (ret []*v1.C // Get retrieves the ClusterResourceQuota from the index for a given name. func (s *clusterResourceQuotaLister) Get(name string) (*v1.ClusterResourceQuota, error) { - key := &v1.ClusterResourceQuota{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/security/generated/listers/security/internalversion/securitycontextconstraints.go b/pkg/security/generated/listers/security/internalversion/securitycontextconstraints.go index aa988e51768f..961603cfc836 100644 --- a/pkg/security/generated/listers/security/internalversion/securitycontextconstraints.go +++ b/pkg/security/generated/listers/security/internalversion/securitycontextconstraints.go @@ -5,7 +5,6 @@ package internalversion import ( security "github.com/openshift/origin/pkg/security/apis/security" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *securityContextConstraintsLister) List(selector labels.Selector) (ret [ // Get retrieves the SecurityContextConstraints from the index for a given name. func (s *securityContextConstraintsLister) Get(name string) (*security.SecurityContextConstraints, error) { - key := &security.SecurityContextConstraints{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/security/generated/listers/security/v1/securitycontextconstraints.go b/pkg/security/generated/listers/security/v1/securitycontextconstraints.go index 39c0c95334e2..c622619cbec3 100644 --- a/pkg/security/generated/listers/security/v1/securitycontextconstraints.go +++ b/pkg/security/generated/listers/security/v1/securitycontextconstraints.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/security/apis/security/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *securityContextConstraintsLister) List(selector labels.Selector) (ret [ // Get retrieves the SecurityContextConstraints from the index for a given name. func (s *securityContextConstraintsLister) Get(name string) (*v1.SecurityContextConstraints, error) { - key := &v1.SecurityContextConstraints{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/template/generated/listers/template/internalversion/brokertemplateinstance.go b/pkg/template/generated/listers/template/internalversion/brokertemplateinstance.go index bfc0e3b9f0bb..e6c88ab9fbba 100644 --- a/pkg/template/generated/listers/template/internalversion/brokertemplateinstance.go +++ b/pkg/template/generated/listers/template/internalversion/brokertemplateinstance.go @@ -5,7 +5,6 @@ package internalversion import ( template "github.com/openshift/origin/pkg/template/apis/template" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *brokerTemplateInstanceLister) List(selector labels.Selector) (ret []*te // Get retrieves the BrokerTemplateInstance from the index for a given name. func (s *brokerTemplateInstanceLister) Get(name string) (*template.BrokerTemplateInstance, error) { - key := &template.BrokerTemplateInstance{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/template/generated/listers/template/v1/brokertemplateinstance.go b/pkg/template/generated/listers/template/v1/brokertemplateinstance.go index d716ddb9dc6a..2cd5afe5652b 100644 --- a/pkg/template/generated/listers/template/v1/brokertemplateinstance.go +++ b/pkg/template/generated/listers/template/v1/brokertemplateinstance.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/template/apis/template/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *brokerTemplateInstanceLister) List(selector labels.Selector) (ret []*v1 // Get retrieves the BrokerTemplateInstance from the index for a given name. func (s *brokerTemplateInstanceLister) Get(name string) (*v1.BrokerTemplateInstance, error) { - key := &v1.BrokerTemplateInstance{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/user/generated/listers/user/internalversion/group.go b/pkg/user/generated/listers/user/internalversion/group.go index 06d266a22be9..323800b19065 100644 --- a/pkg/user/generated/listers/user/internalversion/group.go +++ b/pkg/user/generated/listers/user/internalversion/group.go @@ -5,7 +5,6 @@ package internalversion import ( user "github.com/openshift/origin/pkg/user/apis/user" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *groupLister) List(selector labels.Selector) (ret []*user.Group, err err // Get retrieves the Group from the index for a given name. func (s *groupLister) Get(name string) (*user.Group, error) { - key := &user.Group{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/user/generated/listers/user/internalversion/identity.go b/pkg/user/generated/listers/user/internalversion/identity.go index 7d36260afb85..fdc348ab4e27 100644 --- a/pkg/user/generated/listers/user/internalversion/identity.go +++ b/pkg/user/generated/listers/user/internalversion/identity.go @@ -5,7 +5,6 @@ package internalversion import ( user "github.com/openshift/origin/pkg/user/apis/user" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *identityLister) List(selector labels.Selector) (ret []*user.Identity, e // Get retrieves the Identity from the index for a given name. func (s *identityLister) Get(name string) (*user.Identity, error) { - key := &user.Identity{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/user/generated/listers/user/internalversion/user.go b/pkg/user/generated/listers/user/internalversion/user.go index da8c84e0f97d..21b1056260c4 100644 --- a/pkg/user/generated/listers/user/internalversion/user.go +++ b/pkg/user/generated/listers/user/internalversion/user.go @@ -5,7 +5,6 @@ package internalversion import ( user "github.com/openshift/origin/pkg/user/apis/user" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *userLister) List(selector labels.Selector) (ret []*user.User, err error // Get retrieves the User from the index for a given name. func (s *userLister) Get(name string) (*user.User, error) { - key := &user.User{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/user/generated/listers/user/v1/group.go b/pkg/user/generated/listers/user/v1/group.go index bd376700b084..cbffa67af1ed 100644 --- a/pkg/user/generated/listers/user/v1/group.go +++ b/pkg/user/generated/listers/user/v1/group.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/user/apis/user/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *groupLister) List(selector labels.Selector) (ret []*v1.Group, err error // Get retrieves the Group from the index for a given name. func (s *groupLister) Get(name string) (*v1.Group, error) { - key := &v1.Group{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/user/generated/listers/user/v1/identity.go b/pkg/user/generated/listers/user/v1/identity.go index 6affd9775244..574c47628de0 100644 --- a/pkg/user/generated/listers/user/v1/identity.go +++ b/pkg/user/generated/listers/user/v1/identity.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/user/apis/user/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *identityLister) List(selector labels.Selector) (ret []*v1.Identity, err // Get retrieves the Identity from the index for a given name. func (s *identityLister) Get(name string) (*v1.Identity, error) { - key := &v1.Identity{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/user/generated/listers/user/v1/user.go b/pkg/user/generated/listers/user/v1/user.go index 0def99319092..4572caecd48f 100644 --- a/pkg/user/generated/listers/user/v1/user.go +++ b/pkg/user/generated/listers/user/v1/user.go @@ -5,7 +5,6 @@ package v1 import ( v1 "github.com/openshift/origin/pkg/user/apis/user/v1" "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -39,8 +38,7 @@ func (s *userLister) List(selector labels.Selector) (ret []*v1.User, err error) // Get retrieves the User from the index for a given name. func (s *userLister) Get(name string) (*v1.User, error) { - key := &v1.User{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/internalversion/externaladmissionhookconfiguration.go b/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/internalversion/externaladmissionhookconfiguration.go index ac200d552917..b9145988d953 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/internalversion/externaladmissionhookconfiguration.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/internalversion/externaladmissionhookconfiguration.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" admissionregistration "k8s.io/kubernetes/pkg/apis/admissionregistration" @@ -55,8 +54,7 @@ func (s *externalAdmissionHookConfigurationLister) List(selector labels.Selector // Get retrieves the ExternalAdmissionHookConfiguration from the index for a given name. func (s *externalAdmissionHookConfigurationLister) Get(name string) (*admissionregistration.ExternalAdmissionHookConfiguration, error) { - key := &admissionregistration.ExternalAdmissionHookConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/internalversion/initializerconfiguration.go b/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/internalversion/initializerconfiguration.go index 8fe394f0eaa3..0a67f7d8e8b2 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/internalversion/initializerconfiguration.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/internalversion/initializerconfiguration.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" admissionregistration "k8s.io/kubernetes/pkg/apis/admissionregistration" @@ -55,8 +54,7 @@ func (s *initializerConfigurationLister) List(selector labels.Selector) (ret []* // Get retrieves the InitializerConfiguration from the index for a given name. func (s *initializerConfigurationLister) Get(name string) (*admissionregistration.InitializerConfiguration, error) { - key := &admissionregistration.InitializerConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index 1bdbfa0027c0..7e358db584bd 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go @@ -20,7 +20,6 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" @@ -55,8 +54,7 @@ func (s *externalAdmissionHookConfigurationLister) List(selector labels.Selector // Get retrieves the ExternalAdmissionHookConfiguration from the index for a given name. func (s *externalAdmissionHookConfigurationLister) Get(name string) (*v1alpha1.ExternalAdmissionHookConfiguration, error) { - key := &v1alpha1.ExternalAdmissionHookConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/v1alpha1/initializerconfiguration.go b/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/v1alpha1/initializerconfiguration.go index 22de9622bec0..05264aa3f528 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/admissionregistration/v1alpha1/initializerconfiguration.go @@ -20,7 +20,6 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" @@ -55,8 +54,7 @@ func (s *initializerConfigurationLister) List(selector labels.Selector) (ret []* // Get retrieves the InitializerConfiguration from the index for a given name. func (s *initializerConfigurationLister) Get(name string) (*v1alpha1.InitializerConfiguration, error) { - key := &v1alpha1.InitializerConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/internalversion/tokenreview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/internalversion/tokenreview.go index df92d2fb20e8..ca878ccd3432 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/internalversion/tokenreview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/internalversion/tokenreview.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" authentication "k8s.io/kubernetes/pkg/apis/authentication" @@ -55,8 +54,7 @@ func (s *tokenReviewLister) List(selector labels.Selector) (ret []*authenticatio // Get retrieves the TokenReview from the index for a given name. func (s *tokenReviewLister) Get(name string) (*authentication.TokenReview, error) { - key := &authentication.TokenReview{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/v1/tokenreview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/v1/tokenreview.go index aab044fe102e..39afaacd48a7 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/v1/tokenreview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/v1/tokenreview.go @@ -20,7 +20,6 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1 "k8s.io/kubernetes/pkg/apis/authentication/v1" @@ -55,8 +54,7 @@ func (s *tokenReviewLister) List(selector labels.Selector) (ret []*v1.TokenRevie // Get retrieves the TokenReview from the index for a given name. func (s *tokenReviewLister) Get(name string) (*v1.TokenReview, error) { - key := &v1.TokenReview{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/v1beta1/tokenreview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/v1beta1/tokenreview.go index 97cfe344195f..6d0b163e80b1 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/v1beta1/tokenreview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/authentication/v1beta1/tokenreview.go @@ -20,7 +20,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" @@ -55,8 +54,7 @@ func (s *tokenReviewLister) List(selector labels.Selector) (ret []*v1beta1.Token // Get retrieves the TokenReview from the index for a given name. func (s *tokenReviewLister) Get(name string) (*v1beta1.TokenReview, error) { - key := &v1beta1.TokenReview{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/internalversion/selfsubjectaccessreview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/internalversion/selfsubjectaccessreview.go index c968fa6d5c54..b883ef6035e7 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/internalversion/selfsubjectaccessreview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/internalversion/selfsubjectaccessreview.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" authorization "k8s.io/kubernetes/pkg/apis/authorization" @@ -55,8 +54,7 @@ func (s *selfSubjectAccessReviewLister) List(selector labels.Selector) (ret []*a // Get retrieves the SelfSubjectAccessReview from the index for a given name. func (s *selfSubjectAccessReviewLister) Get(name string) (*authorization.SelfSubjectAccessReview, error) { - key := &authorization.SelfSubjectAccessReview{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/internalversion/subjectaccessreview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/internalversion/subjectaccessreview.go index fbb6f4044581..d6980c8d69dd 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/internalversion/subjectaccessreview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/internalversion/subjectaccessreview.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" authorization "k8s.io/kubernetes/pkg/apis/authorization" @@ -55,8 +54,7 @@ func (s *subjectAccessReviewLister) List(selector labels.Selector) (ret []*autho // Get retrieves the SubjectAccessReview from the index for a given name. func (s *subjectAccessReviewLister) Get(name string) (*authorization.SubjectAccessReview, error) { - key := &authorization.SubjectAccessReview{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go index ae5758e901c5..a93788ef6cff 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go @@ -20,7 +20,6 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1 "k8s.io/kubernetes/pkg/apis/authorization/v1" @@ -55,8 +54,7 @@ func (s *selfSubjectAccessReviewLister) List(selector labels.Selector) (ret []*v // Get retrieves the SelfSubjectAccessReview from the index for a given name. func (s *selfSubjectAccessReviewLister) Get(name string) (*v1.SelfSubjectAccessReview, error) { - key := &v1.SelfSubjectAccessReview{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1/subjectaccessreview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1/subjectaccessreview.go index 4a36cff22aa7..f9e7d19d3133 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1/subjectaccessreview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1/subjectaccessreview.go @@ -20,7 +20,6 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1 "k8s.io/kubernetes/pkg/apis/authorization/v1" @@ -55,8 +54,7 @@ func (s *subjectAccessReviewLister) List(selector labels.Selector) (ret []*v1.Su // Get retrieves the SubjectAccessReview from the index for a given name. func (s *subjectAccessReviewLister) Get(name string) (*v1.SubjectAccessReview, error) { - key := &v1.SubjectAccessReview{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go index 197e15b5c83e..42ffcb0a2b46 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go @@ -20,7 +20,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" @@ -55,8 +54,7 @@ func (s *selfSubjectAccessReviewLister) List(selector labels.Selector) (ret []*v // Get retrieves the SelfSubjectAccessReview from the index for a given name. func (s *selfSubjectAccessReviewLister) Get(name string) (*v1beta1.SelfSubjectAccessReview, error) { - key := &v1beta1.SelfSubjectAccessReview{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go index b4b877d936f1..469cc93c4862 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go @@ -20,7 +20,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" @@ -55,8 +54,7 @@ func (s *subjectAccessReviewLister) List(selector labels.Selector) (ret []*v1bet // Get retrieves the SubjectAccessReview from the index for a given name. func (s *subjectAccessReviewLister) Get(name string) (*v1beta1.SubjectAccessReview, error) { - key := &v1beta1.SubjectAccessReview{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/certificates/internalversion/certificatesigningrequest.go b/vendor/k8s.io/kubernetes/pkg/client/listers/certificates/internalversion/certificatesigningrequest.go index 3ba28efa5d62..4ded13d7a608 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/certificates/internalversion/certificatesigningrequest.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/certificates/internalversion/certificatesigningrequest.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" certificates "k8s.io/kubernetes/pkg/apis/certificates" @@ -55,8 +54,7 @@ func (s *certificateSigningRequestLister) List(selector labels.Selector) (ret [] // Get retrieves the CertificateSigningRequest from the index for a given name. func (s *certificateSigningRequestLister) Get(name string) (*certificates.CertificateSigningRequest, error) { - key := &certificates.CertificateSigningRequest{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go b/vendor/k8s.io/kubernetes/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go index 5dba8ae5178d..385aee4b16aa 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go @@ -20,7 +20,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" @@ -55,8 +54,7 @@ func (s *certificateSigningRequestLister) List(selector labels.Selector) (ret [] // Get retrieves the CertificateSigningRequest from the index for a given name. func (s *certificateSigningRequestLister) Get(name string) (*v1beta1.CertificateSigningRequest, error) { - key := &v1beta1.CertificateSigningRequest{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/componentstatus.go b/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/componentstatus.go index 8f0a0a71f098..7e560ba70914 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/componentstatus.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/componentstatus.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" api "k8s.io/kubernetes/pkg/api" @@ -55,8 +54,7 @@ func (s *componentStatusLister) List(selector labels.Selector) (ret []*api.Compo // Get retrieves the ComponentStatus from the index for a given name. func (s *componentStatusLister) Get(name string) (*api.ComponentStatus, error) { - key := &api.ComponentStatus{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/namespace.go b/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/namespace.go index c925f652373c..2f5933a6f5dd 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/namespace.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/namespace.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" api "k8s.io/kubernetes/pkg/api" @@ -55,8 +54,7 @@ func (s *namespaceLister) List(selector labels.Selector) (ret []*api.Namespace, // Get retrieves the Namespace from the index for a given name. func (s *namespaceLister) Get(name string) (*api.Namespace, error) { - key := &api.Namespace{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/node.go b/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/node.go index ba33d64896d6..8625fbc5f2db 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/node.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/node.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" api "k8s.io/kubernetes/pkg/api" @@ -55,8 +54,7 @@ func (s *nodeLister) List(selector labels.Selector) (ret []*api.Node, err error) // Get retrieves the Node from the index for a given name. func (s *nodeLister) Get(name string) (*api.Node, error) { - key := &api.Node{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/persistentvolume.go b/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/persistentvolume.go index 040058df20fd..808af1e9ef5a 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/persistentvolume.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/core/internalversion/persistentvolume.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" api "k8s.io/kubernetes/pkg/api" @@ -55,8 +54,7 @@ func (s *persistentVolumeLister) List(selector labels.Selector) (ret []*api.Pers // Get retrieves the PersistentVolume from the index for a given name. func (s *persistentVolumeLister) Get(name string) (*api.PersistentVolume, error) { - key := &api.PersistentVolume{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/componentstatus.go b/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/componentstatus.go index 5c25e56db683..de8f09ac07bb 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/componentstatus.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/componentstatus.go @@ -20,7 +20,6 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1 "k8s.io/kubernetes/pkg/api/v1" @@ -55,8 +54,7 @@ func (s *componentStatusLister) List(selector labels.Selector) (ret []*v1.Compon // Get retrieves the ComponentStatus from the index for a given name. func (s *componentStatusLister) Get(name string) (*v1.ComponentStatus, error) { - key := &v1.ComponentStatus{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/namespace.go b/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/namespace.go index c08a385a58e9..69099ab7c0c3 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/namespace.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/namespace.go @@ -20,7 +20,6 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1 "k8s.io/kubernetes/pkg/api/v1" @@ -55,8 +54,7 @@ func (s *namespaceLister) List(selector labels.Selector) (ret []*v1.Namespace, e // Get retrieves the Namespace from the index for a given name. func (s *namespaceLister) Get(name string) (*v1.Namespace, error) { - key := &v1.Namespace{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/node.go b/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/node.go index 29a4196f21b0..36ed2c8b4fce 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/node.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/node.go @@ -20,7 +20,6 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1 "k8s.io/kubernetes/pkg/api/v1" @@ -55,8 +54,7 @@ func (s *nodeLister) List(selector labels.Selector) (ret []*v1.Node, err error) // Get retrieves the Node from the index for a given name. func (s *nodeLister) Get(name string) (*v1.Node, error) { - key := &v1.Node{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/persistentvolume.go b/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/persistentvolume.go index b77a9d532670..63b235015035 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/persistentvolume.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/core/v1/persistentvolume.go @@ -20,7 +20,6 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1 "k8s.io/kubernetes/pkg/api/v1" @@ -55,8 +54,7 @@ func (s *persistentVolumeLister) List(selector labels.Selector) (ret []*v1.Persi // Get retrieves the PersistentVolume from the index for a given name. func (s *persistentVolumeLister) Get(name string) (*v1.PersistentVolume, error) { - key := &v1.PersistentVolume{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/internalversion/podsecuritypolicy.go b/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/internalversion/podsecuritypolicy.go index 03a976bad28a..f57b903989e3 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/internalversion/podsecuritypolicy.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/internalversion/podsecuritypolicy.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" extensions "k8s.io/kubernetes/pkg/apis/extensions" @@ -55,8 +54,7 @@ func (s *podSecurityPolicyLister) List(selector labels.Selector) (ret []*extensi // Get retrieves the PodSecurityPolicy from the index for a given name. func (s *podSecurityPolicyLister) Get(name string) (*extensions.PodSecurityPolicy, error) { - key := &extensions.PodSecurityPolicy{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/internalversion/thirdpartyresource.go b/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/internalversion/thirdpartyresource.go index 6177bf5f55ac..5537b374cd58 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/internalversion/thirdpartyresource.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/internalversion/thirdpartyresource.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" extensions "k8s.io/kubernetes/pkg/apis/extensions" @@ -55,8 +54,7 @@ func (s *thirdPartyResourceLister) List(selector labels.Selector) (ret []*extens // Get retrieves the ThirdPartyResource from the index for a given name. func (s *thirdPartyResourceLister) Get(name string) (*extensions.ThirdPartyResource, error) { - key := &extensions.ThirdPartyResource{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go b/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go index f9f6a789e5d9..b950601d1fd9 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go @@ -20,7 +20,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -55,8 +54,7 @@ func (s *podSecurityPolicyLister) List(selector labels.Selector) (ret []*v1beta1 // Get retrieves the PodSecurityPolicy from the index for a given name. func (s *podSecurityPolicyLister) Get(name string) (*v1beta1.PodSecurityPolicy, error) { - key := &v1beta1.PodSecurityPolicy{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go b/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go index 7f24863acd34..2a73f7e8855b 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go @@ -20,7 +20,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -55,8 +54,7 @@ func (s *thirdPartyResourceLister) List(selector labels.Selector) (ret []*v1beta // Get retrieves the ThirdPartyResource from the index for a given name. func (s *thirdPartyResourceLister) Get(name string) (*v1beta1.ThirdPartyResource, error) { - key := &v1beta1.ThirdPartyResource{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/imagepolicy/internalversion/imagereview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/imagepolicy/internalversion/imagereview.go index 98cfe57b9fb3..68b75375902f 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/imagepolicy/internalversion/imagereview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/imagepolicy/internalversion/imagereview.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" imagepolicy "k8s.io/kubernetes/pkg/apis/imagepolicy" @@ -55,8 +54,7 @@ func (s *imageReviewLister) List(selector labels.Selector) (ret []*imagepolicy.I // Get retrieves the ImageReview from the index for a given name. func (s *imageReviewLister) Get(name string) (*imagepolicy.ImageReview, error) { - key := &imagepolicy.ImageReview{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go b/vendor/k8s.io/kubernetes/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go index eda2191407c6..5b273c417507 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go @@ -20,7 +20,6 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1alpha1 "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1" @@ -55,8 +54,7 @@ func (s *imageReviewLister) List(selector labels.Selector) (ret []*v1alpha1.Imag // Get retrieves the ImageReview from the index for a given name. func (s *imageReviewLister) Get(name string) (*v1alpha1.ImageReview, error) { - key := &v1alpha1.ImageReview{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/internalversion/clusterrole.go b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/internalversion/clusterrole.go index eda1cc3acfe5..ae4089520d3d 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/internalversion/clusterrole.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/internalversion/clusterrole.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" rbac "k8s.io/kubernetes/pkg/apis/rbac" @@ -55,8 +54,7 @@ func (s *clusterRoleLister) List(selector labels.Selector) (ret []*rbac.ClusterR // Get retrieves the ClusterRole from the index for a given name. func (s *clusterRoleLister) Get(name string) (*rbac.ClusterRole, error) { - key := &rbac.ClusterRole{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/internalversion/clusterrolebinding.go b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/internalversion/clusterrolebinding.go index fed2b2e9f368..258c41768e1a 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/internalversion/clusterrolebinding.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/internalversion/clusterrolebinding.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" rbac "k8s.io/kubernetes/pkg/apis/rbac" @@ -55,8 +54,7 @@ func (s *clusterRoleBindingLister) List(selector labels.Selector) (ret []*rbac.C // Get retrieves the ClusterRoleBinding from the index for a given name. func (s *clusterRoleBindingLister) Get(name string) (*rbac.ClusterRoleBinding, error) { - key := &rbac.ClusterRoleBinding{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1/clusterrole.go b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1/clusterrole.go index 2d1a6849a53e..c9fc701b6267 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1/clusterrole.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1/clusterrole.go @@ -20,7 +20,6 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" @@ -55,8 +54,7 @@ func (s *clusterRoleLister) List(selector labels.Selector) (ret []*v1alpha1.Clus // Get retrieves the ClusterRole from the index for a given name. func (s *clusterRoleLister) Get(name string) (*v1alpha1.ClusterRole, error) { - key := &v1alpha1.ClusterRole{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go index 4aa41409d45a..5685676ad271 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go @@ -20,7 +20,6 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" @@ -55,8 +54,7 @@ func (s *clusterRoleBindingLister) List(selector labels.Selector) (ret []*v1alph // Get retrieves the ClusterRoleBinding from the index for a given name. func (s *clusterRoleBindingLister) Get(name string) (*v1alpha1.ClusterRoleBinding, error) { - key := &v1alpha1.ClusterRoleBinding{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1/clusterrole.go b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1/clusterrole.go index a9dfcdca1778..0dbeb6e84382 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1/clusterrole.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1/clusterrole.go @@ -20,7 +20,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" @@ -55,8 +54,7 @@ func (s *clusterRoleLister) List(selector labels.Selector) (ret []*v1beta1.Clust // Get retrieves the ClusterRole from the index for a given name. func (s *clusterRoleLister) Get(name string) (*v1beta1.ClusterRole, error) { - key := &v1beta1.ClusterRole{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go index 9a795f30d1e0..d981b91d0a5d 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go @@ -20,7 +20,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" @@ -55,8 +54,7 @@ func (s *clusterRoleBindingLister) List(selector labels.Selector) (ret []*v1beta // Get retrieves the ClusterRoleBinding from the index for a given name. func (s *clusterRoleBindingLister) Get(name string) (*v1beta1.ClusterRoleBinding, error) { - key := &v1beta1.ClusterRoleBinding{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/storage/internalversion/storageclass.go b/vendor/k8s.io/kubernetes/pkg/client/listers/storage/internalversion/storageclass.go index f1898a98f7fe..b14973fe250d 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/storage/internalversion/storageclass.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/storage/internalversion/storageclass.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" storage "k8s.io/kubernetes/pkg/apis/storage" @@ -55,8 +54,7 @@ func (s *storageClassLister) List(selector labels.Selector) (ret []*storage.Stor // Get retrieves the StorageClass from the index for a given name. func (s *storageClassLister) Get(name string) (*storage.StorageClass, error) { - key := &storage.StorageClass{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/storage/v1/storageclass.go b/vendor/k8s.io/kubernetes/pkg/client/listers/storage/v1/storageclass.go index f41e47ddfe18..3ae393d66ab6 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/storage/v1/storageclass.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/storage/v1/storageclass.go @@ -20,7 +20,6 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1 "k8s.io/kubernetes/pkg/apis/storage/v1" @@ -55,8 +54,7 @@ func (s *storageClassLister) List(selector labels.Selector) (ret []*v1.StorageCl // Get retrieves the StorageClass from the index for a given name. func (s *storageClassLister) Get(name string) (*v1.StorageClass, error) { - key := &v1.StorageClass{ObjectMeta: meta_v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/listers/storage/v1beta1/storageclass.go b/vendor/k8s.io/kubernetes/pkg/client/listers/storage/v1beta1/storageclass.go index b9a3a8b51bbe..670e5cf1cacc 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/listers/storage/v1beta1/storageclass.go +++ b/vendor/k8s.io/kubernetes/pkg/client/listers/storage/v1beta1/storageclass.go @@ -20,7 +20,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" @@ -55,8 +54,7 @@ func (s *storageClassLister) List(selector labels.Selector) (ret []*v1beta1.Stor // Get retrieves the StorageClass from the index for a given name. func (s *storageClassLister) Get(name string) (*v1beta1.StorageClass, error) { - key := &v1beta1.StorageClass{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go index 27bb4cad884a..1bd8480514eb 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go +++ b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go @@ -21,7 +21,6 @@ package internalversion import ( apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -55,8 +54,7 @@ func (s *customResourceDefinitionLister) List(selector labels.Selector) (ret []* // Get retrieves the CustomResourceDefinition from the index for a given name. func (s *customResourceDefinitionLister) Get(name string) (*apiextensions.CustomResourceDefinition, error) { - key := &apiextensions.CustomResourceDefinition{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go index f9b2a8f1e4b0..316721bd68e9 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go +++ b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go @@ -21,7 +21,6 @@ package v1beta1 import ( v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -55,8 +54,7 @@ func (s *customResourceDefinitionLister) List(selector labels.Selector) (ret []* // Get retrieves the CustomResourceDefinition from the index for a given name. func (s *customResourceDefinitionLister) Get(name string) (*v1beta1.CustomResourceDefinition, error) { - key := &v1beta1.CustomResourceDefinition{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go index d24fc23a5672..4f2426054289 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go +++ b/vendor/k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go @@ -323,8 +323,7 @@ func (s *$.type|private$Lister) $.type|publicPlural$(namespace string) $.type|pu var typeLister_NonNamespacedGet = ` // Get retrieves the $.type|public$ from the index for a given name. func (s *$.type|private$Lister) Get(name string) (*$.type|raw$, error) { - key := &$.type|raw${ObjectMeta: $.objectMeta|raw${Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go index 24f2409d9975..675d8228a96d 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go +++ b/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go @@ -20,7 +20,6 @@ package internalversion import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration" @@ -55,8 +54,7 @@ func (s *aPIServiceLister) List(selector labels.Selector) (ret []*apiregistratio // Get retrieves the APIService from the index for a given name. func (s *aPIServiceLister) Get(name string) (*apiregistration.APIService, error) { - key := &apiregistration.APIService{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1/apiservice.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1/apiservice.go index 145f318e63d2..4ccaa66956d9 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1/apiservice.go +++ b/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1/apiservice.go @@ -20,7 +20,6 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" v1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" @@ -55,8 +54,7 @@ func (s *aPIServiceLister) List(selector labels.Selector) (ret []*v1beta1.APISer // Get retrieves the APIService from the index for a given name. func (s *aPIServiceLister) Get(name string) (*v1beta1.APIService, error) { - key := &v1beta1.APIService{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err }