Skip to content

Commit 8db50e6

Browse files
tirandeads2k
tiran
authored and
deads2k
committed
UPSTREAM: 54257: Use GetByKey() in typeLister_NonNamespacedGet
The Get() function of non-namespace lister passes a temporary object to indexer.Get() in order to fetch the actual object from the indexer. This may cause Go to allocate the temporary object on the heap instead of the stack, as it is passed into interfaces. For non-namespaced objects, Get(&Type{ObjectMeta: v1.ObjectMeta{Name: name}}) should be equivalent to GetByKey(name). This could be the root cause of excessive allocations, e.g. in tests clusterRoleLister.Get() has trigger 4 billion allocations. See openshift/origin#16954 Signed-off-by: Christian Heimes <[email protected]> Signed-off-by: Monis Khan <[email protected]> :100644 100644 ac200d5529... b9145988d9... M pkg/client/listers/admissionregistration/internalversion/externaladmissionhookconfiguration.go :100644 100644 8fe394f0ea... 0a67f7d8e8... M pkg/client/listers/admissionregistration/internalversion/initializerconfiguration.go :100644 100644 1bdbfa0027... 7e358db584... M pkg/client/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go :100644 100644 22de9622be... 05264aa3f5... M pkg/client/listers/admissionregistration/v1alpha1/initializerconfiguration.go :100644 100644 df92d2fb20... ca878ccd34... M pkg/client/listers/authentication/internalversion/tokenreview.go :100644 100644 aab044fe10... 39afaacd48... M pkg/client/listers/authentication/v1/tokenreview.go :100644 100644 97cfe34419... 6d0b163e80... M pkg/client/listers/authentication/v1beta1/tokenreview.go :100644 100644 c968fa6d5c... b883ef6035... M pkg/client/listers/authorization/internalversion/selfsubjectaccessreview.go :100644 100644 fbb6f40445... d6980c8d69... M pkg/client/listers/authorization/internalversion/subjectaccessreview.go :100644 100644 ae5758e901... a93788ef6c... M pkg/client/listers/authorization/v1/selfsubjectaccessreview.go :100644 100644 4a36cff22a... f9e7d19d31... M pkg/client/listers/authorization/v1/subjectaccessreview.go :100644 100644 197e15b5c8... 42ffcb0a2b... M pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go :100644 100644 b4b877d936... 469cc93c48... M pkg/client/listers/authorization/v1beta1/subjectaccessreview.go :100644 100644 3ba28efa5d... 4ded13d7a6... M pkg/client/listers/certificates/internalversion/certificatesigningrequest.go :100644 100644 5dba8ae517... 385aee4b16... M pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go :100644 100644 8f0a0a71f0... 7e560ba709... M pkg/client/listers/core/internalversion/componentstatus.go :100644 100644 c925f65237... 2f5933a6f5... M pkg/client/listers/core/internalversion/namespace.go :100644 100644 ba33d64896... 8625fbc5f2... M pkg/client/listers/core/internalversion/node.go :100644 100644 040058df20... 808af1e9ef... M pkg/client/listers/core/internalversion/persistentvolume.go :100644 100644 5c25e56db6... de8f09ac07... M pkg/client/listers/core/v1/componentstatus.go :100644 100644 c08a385a58... 69099ab7c0... M pkg/client/listers/core/v1/namespace.go :100644 100644 29a4196f21... 36ed2c8b4f... M pkg/client/listers/core/v1/node.go :100644 100644 b77a9d5326... 63b2350150... M pkg/client/listers/core/v1/persistentvolume.go :100644 100644 03a976bad2... f57b903989... M pkg/client/listers/extensions/internalversion/podsecuritypolicy.go :100644 100644 6177bf5f55... 5537b374cd... M pkg/client/listers/extensions/internalversion/thirdpartyresource.go :100644 100644 f9f6a789e5... b950601d1f... M pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go :100644 100644 7f24863acd... 2a73f7e885... M pkg/client/listers/extensions/v1beta1/thirdpartyresource.go :100644 100644 98cfe57b9f... 68b7537590... M pkg/client/listers/imagepolicy/internalversion/imagereview.go :100644 100644 eda2191407... 5b273c4175... M pkg/client/listers/imagepolicy/v1alpha1/imagereview.go :100644 100644 eda1cc3acf... ae4089520d... M pkg/client/listers/rbac/internalversion/clusterrole.go :100644 100644 fed2b2e9f3... 258c41768e... M pkg/client/listers/rbac/internalversion/clusterrolebinding.go :100644 100644 2d1a6849a5... c9fc701b62... M pkg/client/listers/rbac/v1alpha1/clusterrole.go :100644 100644 4aa41409d4... 5685676ad2... M pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go :100644 100644 a9dfcdca17... 0dbeb6e843... M pkg/client/listers/rbac/v1beta1/clusterrole.go :100644 100644 9a795f30d1... d981b91d0a... M pkg/client/listers/rbac/v1beta1/clusterrolebinding.go :100644 100644 f1898a98f7... b14973fe25... M pkg/client/listers/storage/internalversion/storageclass.go :100644 100644 f41e47ddfe... 3ae393d66a... M pkg/client/listers/storage/v1/storageclass.go :100644 100644 b9a3a8b51b... 670e5cf1ca... M pkg/client/listers/storage/v1beta1/storageclass.go :100644 100644 27bb4cad88... 1bd8480514... M staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go :100644 100644 f9b2a8f1e4... 316721bd68... M staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go :100644 100644 d24fc23a56... 4f24260542... M staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go :100644 100644 24f2409d99... 675d8228a9... M staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion/apiservice.go :100644 100644 145f318e63... 4ccaa66956... M staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1/apiservice.go
1 parent f7668aa commit 8db50e6

File tree

43 files changed

+43
-128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+43
-128
lines changed

‎pkg/client/listers/admissionregistration/internalversion/externaladmissionhookconfiguration.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package internalversion
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
admissionregistration "k8s.io/kubernetes/pkg/apis/admissionregistration"
@@ -55,8 +54,7 @@ func (s *externalAdmissionHookConfigurationLister) List(selector labels.Selector
5554

5655
// Get retrieves the ExternalAdmissionHookConfiguration from the index for a given name.
5756
func (s *externalAdmissionHookConfigurationLister) Get(name string) (*admissionregistration.ExternalAdmissionHookConfiguration, error) {
58-
key := &admissionregistration.ExternalAdmissionHookConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/admissionregistration/internalversion/initializerconfiguration.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package internalversion
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
admissionregistration "k8s.io/kubernetes/pkg/apis/admissionregistration"
@@ -55,8 +54,7 @@ func (s *initializerConfigurationLister) List(selector labels.Selector) (ret []*
5554

5655
// Get retrieves the InitializerConfiguration from the index for a given name.
5756
func (s *initializerConfigurationLister) Get(name string) (*admissionregistration.InitializerConfiguration, error) {
58-
key := &admissionregistration.InitializerConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1alpha1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1"
@@ -55,8 +54,7 @@ func (s *externalAdmissionHookConfigurationLister) List(selector labels.Selector
5554

5655
// Get retrieves the ExternalAdmissionHookConfiguration from the index for a given name.
5756
func (s *externalAdmissionHookConfigurationLister) Get(name string) (*v1alpha1.ExternalAdmissionHookConfiguration, error) {
58-
key := &v1alpha1.ExternalAdmissionHookConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/admissionregistration/v1alpha1/initializerconfiguration.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1alpha1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1"
@@ -55,8 +54,7 @@ func (s *initializerConfigurationLister) List(selector labels.Selector) (ret []*
5554

5655
// Get retrieves the InitializerConfiguration from the index for a given name.
5756
func (s *initializerConfigurationLister) Get(name string) (*v1alpha1.InitializerConfiguration, error) {
58-
key := &v1alpha1.InitializerConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/authentication/internalversion/tokenreview.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package internalversion
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
authentication "k8s.io/kubernetes/pkg/apis/authentication"
@@ -55,8 +54,7 @@ func (s *tokenReviewLister) List(selector labels.Selector) (ret []*authenticatio
5554

5655
// Get retrieves the TokenReview from the index for a given name.
5756
func (s *tokenReviewLister) Get(name string) (*authentication.TokenReview, error) {
58-
key := &authentication.TokenReview{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/authentication/v1/tokenreview.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1 "k8s.io/kubernetes/pkg/apis/authentication/v1"
@@ -55,8 +54,7 @@ func (s *tokenReviewLister) List(selector labels.Selector) (ret []*v1.TokenRevie
5554

5655
// Get retrieves the TokenReview from the index for a given name.
5756
func (s *tokenReviewLister) Get(name string) (*v1.TokenReview, error) {
58-
key := &v1.TokenReview{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/authentication/v1beta1/tokenreview.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1beta1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
@@ -55,8 +54,7 @@ func (s *tokenReviewLister) List(selector labels.Selector) (ret []*v1beta1.Token
5554

5655
// Get retrieves the TokenReview from the index for a given name.
5756
func (s *tokenReviewLister) Get(name string) (*v1beta1.TokenReview, error) {
58-
key := &v1beta1.TokenReview{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/authorization/internalversion/selfsubjectaccessreview.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package internalversion
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
authorization "k8s.io/kubernetes/pkg/apis/authorization"
@@ -55,8 +54,7 @@ func (s *selfSubjectAccessReviewLister) List(selector labels.Selector) (ret []*a
5554

5655
// Get retrieves the SelfSubjectAccessReview from the index for a given name.
5756
func (s *selfSubjectAccessReviewLister) Get(name string) (*authorization.SelfSubjectAccessReview, error) {
58-
key := &authorization.SelfSubjectAccessReview{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/authorization/internalversion/subjectaccessreview.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package internalversion
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
authorization "k8s.io/kubernetes/pkg/apis/authorization"
@@ -55,8 +54,7 @@ func (s *subjectAccessReviewLister) List(selector labels.Selector) (ret []*autho
5554

5655
// Get retrieves the SubjectAccessReview from the index for a given name.
5756
func (s *subjectAccessReviewLister) Get(name string) (*authorization.SubjectAccessReview, error) {
58-
key := &authorization.SubjectAccessReview{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/authorization/v1/selfsubjectaccessreview.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1 "k8s.io/kubernetes/pkg/apis/authorization/v1"
@@ -55,8 +54,7 @@ func (s *selfSubjectAccessReviewLister) List(selector labels.Selector) (ret []*v
5554

5655
// Get retrieves the SelfSubjectAccessReview from the index for a given name.
5756
func (s *selfSubjectAccessReviewLister) Get(name string) (*v1.SelfSubjectAccessReview, error) {
58-
key := &v1.SelfSubjectAccessReview{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/authorization/v1/subjectaccessreview.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1 "k8s.io/kubernetes/pkg/apis/authorization/v1"
@@ -55,8 +54,7 @@ func (s *subjectAccessReviewLister) List(selector labels.Selector) (ret []*v1.Su
5554

5655
// Get retrieves the SubjectAccessReview from the index for a given name.
5756
func (s *subjectAccessReviewLister) Get(name string) (*v1.SubjectAccessReview, error) {
58-
key := &v1.SubjectAccessReview{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1beta1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
@@ -55,8 +54,7 @@ func (s *selfSubjectAccessReviewLister) List(selector labels.Selector) (ret []*v
5554

5655
// Get retrieves the SelfSubjectAccessReview from the index for a given name.
5756
func (s *selfSubjectAccessReviewLister) Get(name string) (*v1beta1.SelfSubjectAccessReview, error) {
58-
key := &v1beta1.SelfSubjectAccessReview{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/authorization/v1beta1/subjectaccessreview.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1beta1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
@@ -55,8 +54,7 @@ func (s *subjectAccessReviewLister) List(selector labels.Selector) (ret []*v1bet
5554

5655
// Get retrieves the SubjectAccessReview from the index for a given name.
5756
func (s *subjectAccessReviewLister) Get(name string) (*v1beta1.SubjectAccessReview, error) {
58-
key := &v1beta1.SubjectAccessReview{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/certificates/internalversion/certificatesigningrequest.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package internalversion
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
certificates "k8s.io/kubernetes/pkg/apis/certificates"
@@ -55,8 +54,7 @@ func (s *certificateSigningRequestLister) List(selector labels.Selector) (ret []
5554

5655
// Get retrieves the CertificateSigningRequest from the index for a given name.
5756
func (s *certificateSigningRequestLister) Get(name string) (*certificates.CertificateSigningRequest, error) {
58-
key := &certificates.CertificateSigningRequest{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1beta1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
@@ -55,8 +54,7 @@ func (s *certificateSigningRequestLister) List(selector labels.Selector) (ret []
5554

5655
// Get retrieves the CertificateSigningRequest from the index for a given name.
5756
func (s *certificateSigningRequestLister) Get(name string) (*v1beta1.CertificateSigningRequest, error) {
58-
key := &v1beta1.CertificateSigningRequest{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/core/internalversion/componentstatus.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package internalversion
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
api "k8s.io/kubernetes/pkg/api"
@@ -55,8 +54,7 @@ func (s *componentStatusLister) List(selector labels.Selector) (ret []*api.Compo
5554

5655
// Get retrieves the ComponentStatus from the index for a given name.
5756
func (s *componentStatusLister) Get(name string) (*api.ComponentStatus, error) {
58-
key := &api.ComponentStatus{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/core/internalversion/namespace.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package internalversion
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
api "k8s.io/kubernetes/pkg/api"
@@ -55,8 +54,7 @@ func (s *namespaceLister) List(selector labels.Selector) (ret []*api.Namespace,
5554

5655
// Get retrieves the Namespace from the index for a given name.
5756
func (s *namespaceLister) Get(name string) (*api.Namespace, error) {
58-
key := &api.Namespace{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/core/internalversion/node.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package internalversion
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
api "k8s.io/kubernetes/pkg/api"
@@ -55,8 +54,7 @@ func (s *nodeLister) List(selector labels.Selector) (ret []*api.Node, err error)
5554

5655
// Get retrieves the Node from the index for a given name.
5756
func (s *nodeLister) Get(name string) (*api.Node, error) {
58-
key := &api.Node{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/core/internalversion/persistentvolume.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package internalversion
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
api "k8s.io/kubernetes/pkg/api"
@@ -55,8 +54,7 @@ func (s *persistentVolumeLister) List(selector labels.Selector) (ret []*api.Pers
5554

5655
// Get retrieves the PersistentVolume from the index for a given name.
5756
func (s *persistentVolumeLister) Get(name string) (*api.PersistentVolume, error) {
58-
key := &api.PersistentVolume{ObjectMeta: v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/core/v1/componentstatus.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -55,8 +54,7 @@ func (s *componentStatusLister) List(selector labels.Selector) (ret []*v1.Compon
5554

5655
// Get retrieves the ComponentStatus from the index for a given name.
5756
func (s *componentStatusLister) Get(name string) (*v1.ComponentStatus, error) {
58-
key := &v1.ComponentStatus{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/core/v1/namespace.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -55,8 +54,7 @@ func (s *namespaceLister) List(selector labels.Selector) (ret []*v1.Namespace, e
5554

5655
// Get retrieves the Namespace from the index for a given name.
5756
func (s *namespaceLister) Get(name string) (*v1.Namespace, error) {
58-
key := &v1.Namespace{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

‎pkg/client/listers/core/v1/node.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package v1
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/api/errors"
23-
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/labels"
2524
"k8s.io/client-go/tools/cache"
2625
v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -55,8 +54,7 @@ func (s *nodeLister) List(selector labels.Selector) (ret []*v1.Node, err error)
5554

5655
// Get retrieves the Node from the index for a given name.
5756
func (s *nodeLister) Get(name string) (*v1.Node, error) {
58-
key := &v1.Node{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
59-
obj, exists, err := s.indexer.Get(key)
57+
obj, exists, err := s.indexer.GetByKey(name)
6058
if err != nil {
6159
return nil, err
6260
}

0 commit comments

Comments
 (0)