From 3432fea8b2dcf3c521e388383621625e210b7476 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 5 Dec 2016 13:02:55 +0100 Subject: [PATCH 1/3] Pipe GetOptions to storage --- federation/registry/cluster/registry.go | 7 ++-- pkg/api/rest/rest.go | 3 +- pkg/api/rest/resttest/resttest.go | 22 ++++++------ pkg/apiserver/apiserver_test.go | 10 +++--- pkg/apiserver/resthandler.go | 6 +++- pkg/apiserver/resthandler_test.go | 2 +- pkg/controller/serviceaccount/tokengetter.go | 5 +-- pkg/genericapiserver/genericapiserver_test.go | 2 +- pkg/registry/apps/petset/etcd/etcd.go | 5 +-- pkg/registry/apps/petset/etcd/etcd_test.go | 2 +- .../horizontalpodautoscaler/etcd/etcd.go | 5 +-- pkg/registry/batch/cronjob/etcd/etcd.go | 5 +-- pkg/registry/batch/job/etcd/etcd.go | 5 +-- .../certificates/certificates/registry.go | 7 ++-- pkg/registry/core/componentstatus/rest.go | 3 +- .../core/componentstatus/rest_test.go | 5 +-- pkg/registry/core/configmap/registry.go | 7 ++-- pkg/registry/core/controller/etcd/etcd.go | 11 +++--- .../core/controller/etcd/etcd_test.go | 11 +++--- pkg/registry/core/controller/registry.go | 7 ++-- pkg/registry/core/endpoint/registry.go | 7 ++-- pkg/registry/core/namespace/etcd/etcd.go | 6 ++-- pkg/registry/core/namespace/etcd/etcd_test.go | 2 +- pkg/registry/core/namespace/registry.go | 7 ++-- pkg/registry/core/node/etcd/etcd.go | 7 ++-- pkg/registry/core/node/registry.go | 7 ++-- pkg/registry/core/node/strategy.go | 3 +- .../core/persistentvolume/etcd/etcd.go | 5 +-- .../core/persistentvolume/etcd/etcd_test.go | 3 +- .../core/persistentvolumeclaim/etcd/etcd.go | 5 +-- .../persistentvolumeclaim/etcd/etcd_test.go | 3 +- pkg/registry/core/pod/etcd/etcd.go | 4 +-- pkg/registry/core/pod/etcd/etcd_test.go | 19 ++++++----- pkg/registry/core/pod/etcd/eviction.go | 2 +- pkg/registry/core/pod/strategy.go | 5 +-- pkg/registry/core/pod/strategy_test.go | 3 +- pkg/registry/core/resourcequota/etcd/etcd.go | 5 +-- .../core/resourcequota/etcd/etcd_test.go | 5 +-- pkg/registry/core/secret/registry.go | 7 ++-- pkg/registry/core/service/etcd/etcd.go | 5 +-- pkg/registry/core/service/registry.go | 6 ++-- pkg/registry/core/service/rest.go | 12 +++---- pkg/registry/core/service/rest_test.go | 9 ++--- pkg/registry/core/serviceaccount/registry.go | 7 ++-- .../extensions/controller/etcd/etcd.go | 6 ++-- .../extensions/controller/etcd/etcd_test.go | 4 +-- .../extensions/daemonset/etcd/etcd.go | 5 +-- .../extensions/deployment/etcd/etcd.go | 10 +++--- .../extensions/deployment/etcd/etcd_test.go | 10 +++--- .../extensions/deployment/registry.go | 7 ++-- pkg/registry/extensions/ingress/etcd/etcd.go | 5 +-- .../extensions/replicaset/etcd/etcd.go | 11 +++--- .../extensions/replicaset/etcd/etcd_test.go | 12 +++---- .../extensions/replicaset/registry.go | 7 ++-- .../thirdpartyresourcedata/registry.go | 7 ++-- pkg/registry/generic/registry/store.go | 7 ++-- pkg/registry/generic/registry/store_test.go | 34 +++++++++---------- .../policy/poddisruptionbudget/etcd/etcd.go | 5 +-- .../poddisruptionbudget/etcd/etcd_test.go | 4 +-- pkg/registry/rbac/clusterrole/registry.go | 9 ++--- .../rbac/clusterrolebinding/registry.go | 7 ++-- pkg/registry/rbac/role/registry.go | 9 ++--- pkg/registry/rbac/rolebinding/registry.go | 7 ++-- pkg/registry/registrytest/endpoint.go | 3 +- pkg/registry/registrytest/etcd.go | 3 +- pkg/registry/registrytest/node.go | 3 +- pkg/registry/registrytest/service.go | 2 +- 67 files changed, 250 insertions(+), 201 deletions(-) diff --git a/federation/registry/cluster/registry.go b/federation/registry/cluster/registry.go index 2d4cf821c19..65e6bbb5588 100644 --- a/federation/registry/cluster/registry.go +++ b/federation/registry/cluster/registry.go @@ -20,6 +20,7 @@ import ( "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -27,7 +28,7 @@ import ( type Registry interface { ListClusters(ctx api.Context, options *api.ListOptions) (*federation.ClusterList, error) WatchCluster(ctx api.Context, options *api.ListOptions) (watch.Interface, error) - GetCluster(ctx api.Context, name string) (*federation.Cluster, error) + GetCluster(ctx api.Context, name string, options *metav1.GetOptions) (*federation.Cluster, error) CreateCluster(ctx api.Context, cluster *federation.Cluster) error UpdateCluster(ctx api.Context, cluster *federation.Cluster) error DeleteCluster(ctx api.Context, name string) error @@ -56,8 +57,8 @@ func (s *storage) WatchCluster(ctx api.Context, options *api.ListOptions) (watch return s.Watch(ctx, options) } -func (s *storage) GetCluster(ctx api.Context, name string) (*federation.Cluster, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetCluster(ctx api.Context, name string, options *metav1.GetOptions) (*federation.Cluster, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/api/rest/rest.go b/pkg/api/rest/rest.go index 993a9ccea1a..f930789d720 100644 --- a/pkg/api/rest/rest.go +++ b/pkg/api/rest/rest.go @@ -86,7 +86,7 @@ type Getter interface { // Get finds a resource in the storage by name and returns it. // Although it can return an arbitrary error value, IsNotFound(err) is true for the // returned error value err when the specified resource is not found. - Get(ctx api.Context, name string) (runtime.Object, error) + Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) } // GetterWithOptions is an object that retrieve a named RESTful resource and takes @@ -98,6 +98,7 @@ type GetterWithOptions interface { // returned error value err when the specified resource is not found. // The options object passed to it is of the same type returned by the NewGetOptions // method. + // TODO: Pass metav1.GetOptions. Get(ctx api.Context, name string, options runtime.Object) (runtime.Object, error) // NewGetOptions returns an empty options object that will be used to pass diff --git a/pkg/api/rest/resttest/resttest.go b/pkg/api/rest/resttest/resttest.go index 45a18ce1037..04e304d90d1 100644 --- a/pkg/api/rest/resttest/resttest.go +++ b/pkg/api/rest/resttest/resttest.go @@ -841,7 +841,7 @@ func (t *Tester) testDeleteGracefulHasDefault(obj runtime.Object, createFn Creat t.Fatalf("did not gracefully delete resource: %v", err) } - object, err := t.storage.(rest.Getter).Get(ctx, objectMeta.Name) + object, err := t.storage.(rest.Getter).Get(ctx, objectMeta.Name, &metav1.GetOptions{}) if err != nil { t.Fatalf("unexpected error, object should exist: %v", err) } @@ -872,7 +872,7 @@ func (t *Tester) testDeleteGracefulWithValue(obj runtime.Object, createFn Create t.Fatalf("did not gracefully delete resource: %v", err) } - object, err := t.storage.(rest.Getter).Get(ctx, objectMeta.Name) + object, err := t.storage.(rest.Getter).Get(ctx, objectMeta.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error, object should exist: %v", err) } @@ -908,7 +908,7 @@ func (t *Tester) testDeleteGracefulExtend(obj runtime.Object, createFn CreateFun if err != nil { t.Errorf("unexpected error: %v", err) } - object, err := t.storage.(rest.Getter).Get(ctx, objectMeta.Name) + object, err := t.storage.(rest.Getter).Get(ctx, objectMeta.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error, object should exist: %v", err) } @@ -944,7 +944,7 @@ func (t *Tester) testDeleteGracefulImmediate(obj runtime.Object, createFn Create if err != nil { t.Errorf("unexpected error: %v", err) } - _, err = t.storage.(rest.Getter).Get(ctx, objectMeta.Name) + _, err = t.storage.(rest.Getter).Get(ctx, objectMeta.Name, &metav1.GetOptions{}) if !errors.IsNotFound(err) { t.Errorf("unexpected error, object should be deleted immediately: %v", err) } @@ -971,7 +971,7 @@ func (t *Tester) testDeleteGracefulUsesZeroOnNil(obj runtime.Object, createFn Cr if err != nil { t.Errorf("unexpected error: %v", err) } - if _, err := t.storage.(rest.Getter).Get(ctx, objectMeta.Name); !errors.IsNotFound(err) { + if _, err := t.storage.(rest.Getter).Get(ctx, objectMeta.Name, &metav1.GetOptions{}); !errors.IsNotFound(err) { t.Errorf("unexpected error, object should not exist: %v", err) } } @@ -1006,7 +1006,7 @@ func (t *Tester) testDeleteGracefulShorten(obj runtime.Object, createFn CreateFu if err != nil { t.Errorf("unexpected error: %v", err) } - object, err = t.storage.(rest.Getter).Get(ctx, objectMeta.Name) + object, err = t.storage.(rest.Getter).Get(ctx, objectMeta.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error, object should exist: %v", err) } @@ -1043,7 +1043,7 @@ func (t *Tester) testGetDifferentNamespace(obj runtime.Object) { t.Errorf("unexpected error: %v", err) } - got1, err := t.storage.(rest.Getter).Get(ctx1, objMeta.Name) + got1, err := t.storage.(rest.Getter).Get(ctx1, objMeta.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -1055,7 +1055,7 @@ func (t *Tester) testGetDifferentNamespace(obj runtime.Object) { t.Errorf("unexpected namespace of object: %#v, expected: %s", got1, api.NamespaceValue(ctx1)) } - got2, err := t.storage.(rest.Getter).Get(ctx2, objMeta.Name) + got2, err := t.storage.(rest.Getter).Get(ctx2, objMeta.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -1078,7 +1078,7 @@ func (t *Tester) testGetFound(obj runtime.Object) { } existingMeta := t.getObjectMetaOrFail(existing) - got, err := t.storage.(rest.Getter).Get(ctx, t.namer(1)) + got, err := t.storage.(rest.Getter).Get(ctx, t.namer(1), &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -1099,7 +1099,7 @@ func (t *Tester) testGetMimatchedNamespace(obj runtime.Object) { if err != nil { t.Errorf("unexpected error: %v", err) } - _, err = t.storage.(rest.Getter).Get(ctx2, t.namer(4)) + _, err = t.storage.(rest.Getter).Get(ctx2, t.namer(4), &metav1.GetOptions{}) if t.clusterScope { if err != nil { t.Errorf("unexpected error: %v", err) @@ -1118,7 +1118,7 @@ func (t *Tester) testGetNotFound(obj runtime.Object) { if err != nil { t.Errorf("unexpected error: %v", err) } - _, err = t.storage.(rest.Getter).Get(ctx, t.namer(3)) + _, err = t.storage.(rest.Getter).Get(ctx, t.namer(3), &metav1.GetOptions{}) if !errors.IsNotFound(err) { t.Errorf("unexpected error returned: %#v", err) } diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go index 3c73db845da..71b792b5437 100644 --- a/pkg/apiserver/apiserver_test.go +++ b/pkg/apiserver/apiserver_test.go @@ -383,7 +383,7 @@ type SimpleRESTStorage struct { } func (storage *SimpleRESTStorage) Export(ctx api.Context, name string, opts metav1.ExportOptions) (runtime.Object, error) { - obj, err := storage.Get(ctx, name) + obj, err := storage.Get(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, err } @@ -444,7 +444,7 @@ func (h *OutputConnect) ServeHTTP(w http.ResponseWriter, req *http.Request) { w.Write([]byte(h.response)) } -func (storage *SimpleRESTStorage) Get(ctx api.Context, id string) (runtime.Object, error) { +func (storage *SimpleRESTStorage) Get(ctx api.Context, id string, options *metav1.GetOptions) (runtime.Object, error) { storage.checkContext(ctx) if id == "binary" { return storage.stream, storage.errors["get"] @@ -633,7 +633,7 @@ func (r *GetWithOptionsRESTStorage) Get(ctx api.Context, name string, options ru return nil, fmt.Errorf("Unexpected options object: %#v", options) } r.optionsReceived = options - return r.SimpleRESTStorage.Get(ctx, name) + return r.SimpleRESTStorage.Get(ctx, name, &metav1.GetOptions{}) } func (r *GetWithOptionsRESTStorage) NewGetOptions() (runtime.Object, bool, string) { @@ -677,7 +677,7 @@ func (storage *SimpleTypedStorage) New() runtime.Object { return storage.baseType } -func (storage *SimpleTypedStorage) Get(ctx api.Context, id string) (runtime.Object, error) { +func (storage *SimpleTypedStorage) Get(ctx api.Context, id string, options *metav1.GetOptions) (runtime.Object, error) { storage.checkContext(ctx) copied, err := api.Scheme.Copy(storage.item) if err != nil { @@ -3265,7 +3265,7 @@ func (storage *SimpleXGSubresourceRESTStorage) New() runtime.Object { return &SimpleXGSubresource{} } -func (storage *SimpleXGSubresourceRESTStorage) Get(ctx api.Context, id string) (runtime.Object, error) { +func (storage *SimpleXGSubresourceRESTStorage) Get(ctx api.Context, id string, options *metav1.GetOptions) (runtime.Object, error) { copied, err := api.Scheme.Copy(&storage.item) if err != nil { panic(err) diff --git a/pkg/apiserver/resthandler.go b/pkg/apiserver/resthandler.go index 1d37f9e08c1..eeca5d5644b 100644 --- a/pkg/apiserver/resthandler.go +++ b/pkg/apiserver/resthandler.go @@ -131,6 +131,7 @@ func GetResource(r rest.Getter, e rest.Exporter, scope RequestScope) restful.Rou defer trace.LogIfLong(500 * time.Millisecond) // check for export + options := metav1.GetOptions{} if values := req.Request.URL.Query(); len(values) > 0 { exports := metav1.ExportOptions{} if err := scope.ParameterCodec.DecodeParameters(values, schema.GroupVersion{Version: "v1"}, &exports); err != nil { @@ -142,9 +143,12 @@ func GetResource(r rest.Getter, e rest.Exporter, scope RequestScope) restful.Rou } return e.Export(ctx, name, exports) } + if err := scope.ParameterCodec.DecodeParameters(values, schema.GroupVersion{Version: "v1"}, &options); err != nil { + return nil, err + } } - return r.Get(ctx, name) + return r.Get(ctx, name, &options) }) } diff --git a/pkg/apiserver/resthandler_test.go b/pkg/apiserver/resthandler_test.go index 17ffdf61191..dbdfd95d12b 100644 --- a/pkg/apiserver/resthandler_test.go +++ b/pkg/apiserver/resthandler_test.go @@ -102,7 +102,7 @@ func (p *testPatcher) Update(ctx api.Context, name string, objInfo rest.UpdatedO return inPod, false, nil } -func (p *testPatcher) Get(ctx api.Context, name string) (runtime.Object, error) { +func (p *testPatcher) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { p.t.Fatal("Unexpected call to testPatcher.Get") return nil, errors.New("Unexpected call to testPatcher.Get") } diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index 75804ae9885..37b88f2b5a4 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/pkg/controller/serviceaccount/tokengetter.go @@ -19,6 +19,7 @@ package serviceaccount import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/registry/core/secret" secretetcd "k8s.io/kubernetes/pkg/registry/core/secret/etcd" @@ -61,7 +62,7 @@ func NewGetterFromRegistries(serviceAccounts serviceaccountregistry.Registry, se } func (r *registryGetter) GetServiceAccount(namespace, name string) (*v1.ServiceAccount, error) { ctx := api.WithNamespace(api.NewContext(), namespace) - internalServiceAccount, err := r.serviceAccounts.GetServiceAccount(ctx, name) + internalServiceAccount, err := r.serviceAccounts.GetServiceAccount(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, err } @@ -72,7 +73,7 @@ func (r *registryGetter) GetServiceAccount(namespace, name string) (*v1.ServiceA } func (r *registryGetter) GetSecret(namespace, name string) (*v1.Secret, error) { ctx := api.WithNamespace(api.NewContext(), namespace) - internalSecret, err := r.secrets.GetSecret(ctx, name) + internalSecret, err := r.secrets.GetSecret(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, err } diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/genericapiserver_test.go index 95afd163f97..85b30883232 100644 --- a/pkg/genericapiserver/genericapiserver_test.go +++ b/pkg/genericapiserver/genericapiserver_test.go @@ -593,7 +593,7 @@ func (p *testGetterStorage) New() runtime.Object { } } -func (p *testGetterStorage) Get(ctx api.Context, name string) (runtime.Object, error) { +func (p *testGetterStorage) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { return nil, nil } diff --git a/pkg/registry/apps/petset/etcd/etcd.go b/pkg/registry/apps/petset/etcd/etcd.go index 271b36cf1b1..667863dcc7b 100644 --- a/pkg/registry/apps/petset/etcd/etcd.go +++ b/pkg/registry/apps/petset/etcd/etcd.go @@ -20,6 +20,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" appsapi "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/apps/petset" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" @@ -99,8 +100,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/apps/petset/etcd/etcd_test.go b/pkg/registry/apps/petset/etcd/etcd_test.go index ea5499234e5..58576631815 100644 --- a/pkg/registry/apps/petset/etcd/etcd_test.go +++ b/pkg/registry/apps/petset/etcd/etcd_test.go @@ -118,7 +118,7 @@ func TestStatusUpdate(t *testing.T) { if _, _, err := statusStorage.Update(ctx, update.Name, rest.DefaultUpdatedObjectInfo(&update, api.Scheme)); err != nil { t.Fatalf("unexpected error: %v", err) } - obj, err := storage.Get(ctx, "foo") + obj, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go b/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go index 7703c68b822..de5d34e018a 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go @@ -20,6 +20,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" @@ -97,8 +98,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/batch/cronjob/etcd/etcd.go b/pkg/registry/batch/cronjob/etcd/etcd.go index 9d59ffe0601..35cf8764ab3 100644 --- a/pkg/registry/batch/cronjob/etcd/etcd.go +++ b/pkg/registry/batch/cronjob/etcd/etcd.go @@ -20,6 +20,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/batch/cronjob" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" @@ -101,8 +102,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/batch/job/etcd/etcd.go b/pkg/registry/batch/job/etcd/etcd.go index 9c2b05a4163..20a49e83c9e 100644 --- a/pkg/registry/batch/job/etcd/etcd.go +++ b/pkg/registry/batch/job/etcd/etcd.go @@ -20,6 +20,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/batch/job" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" @@ -101,8 +102,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/certificates/certificates/registry.go b/pkg/registry/certificates/certificates/registry.go index e812ef00077..66cf316355c 100644 --- a/pkg/registry/certificates/certificates/registry.go +++ b/pkg/registry/certificates/certificates/registry.go @@ -20,6 +20,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/certificates" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -28,7 +29,7 @@ type Registry interface { ListCSRs(ctx api.Context, options *api.ListOptions) (*certificates.CertificateSigningRequestList, error) CreateCSR(ctx api.Context, csr *certificates.CertificateSigningRequest) error UpdateCSR(ctx api.Context, csr *certificates.CertificateSigningRequest) error - GetCSR(ctx api.Context, csrID string) (*certificates.CertificateSigningRequest, error) + GetCSR(ctx api.Context, csrID string, options *metav1.GetOptions) (*certificates.CertificateSigningRequest, error) DeleteCSR(ctx api.Context, csrID string) error WatchCSRs(ctx api.Context, options *api.ListOptions) (watch.Interface, error) } @@ -67,8 +68,8 @@ func (s *storage) WatchCSRs(ctx api.Context, options *api.ListOptions) (watch.In return s.Watch(ctx, options) } -func (s *storage) GetCSR(ctx api.Context, name string) (*certificates.CertificateSigningRequest, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetCSR(ctx api.Context, name string, options *metav1.GetOptions) (*certificates.CertificateSigningRequest, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/registry/core/componentstatus/rest.go b/pkg/registry/core/componentstatus/rest.go index 984ba879876..a92d9ae9a41 100644 --- a/pkg/registry/core/componentstatus/rest.go +++ b/pkg/registry/core/componentstatus/rest.go @@ -22,6 +22,7 @@ import ( "sync" "k8s.io/kubernetes/pkg/api" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/probe" httpprober "k8s.io/kubernetes/pkg/probe/http" @@ -74,7 +75,7 @@ func (rs *REST) List(ctx api.Context, options *api.ListOptions) (runtime.Object, return &api.ComponentStatusList{Items: reply}, nil } -func (rs *REST) Get(ctx api.Context, name string) (runtime.Object, error) { +func (rs *REST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { servers := rs.GetServersToValidate() if server, ok := servers[name]; !ok { diff --git a/pkg/registry/core/componentstatus/rest_test.go b/pkg/registry/core/componentstatus/rest_test.go index 0d776ecbae9..6a31b3777e3 100644 --- a/pkg/registry/core/componentstatus/rest_test.go +++ b/pkg/registry/core/componentstatus/rest_test.go @@ -27,6 +27,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/probe" "k8s.io/kubernetes/pkg/util/diff" @@ -119,7 +120,7 @@ func TestList_UnknownError(t *testing.T) { func TestGet_NoError(t *testing.T) { r := NewTestREST(testResponse{result: probe.Success, data: "ok"}) - got, err := r.Get(api.NewContext(), "test1") + got, err := r.Get(api.NewContext(), "test1", &metav1.GetOptions{}) if err != nil { t.Fatalf("Unexpected error: %v", err) } @@ -131,7 +132,7 @@ func TestGet_NoError(t *testing.T) { func TestGet_BadName(t *testing.T) { r := NewTestREST(testResponse{result: probe.Success, data: "ok"}) - _, err := r.Get(api.NewContext(), "invalidname") + _, err := r.Get(api.NewContext(), "invalidname", &metav1.GetOptions{}) if err == nil { t.Fatalf("Expected error, but did not get one") } diff --git a/pkg/registry/core/configmap/registry.go b/pkg/registry/core/configmap/registry.go index b3fcc245078..d5bb4936705 100644 --- a/pkg/registry/core/configmap/registry.go +++ b/pkg/registry/core/configmap/registry.go @@ -19,6 +19,7 @@ package configmap import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -26,7 +27,7 @@ import ( type Registry interface { ListConfigMaps(ctx api.Context, options *api.ListOptions) (*api.ConfigMapList, error) WatchConfigMaps(ctx api.Context, options *api.ListOptions) (watch.Interface, error) - GetConfigMap(ctx api.Context, name string) (*api.ConfigMap, error) + GetConfigMap(ctx api.Context, name string, options *metav1.GetOptions) (*api.ConfigMap, error) CreateConfigMap(ctx api.Context, cfg *api.ConfigMap) (*api.ConfigMap, error) UpdateConfigMap(ctx api.Context, cfg *api.ConfigMap) (*api.ConfigMap, error) DeleteConfigMap(ctx api.Context, name string) error @@ -56,8 +57,8 @@ func (s *storage) WatchConfigMaps(ctx api.Context, options *api.ListOptions) (wa return s.Watch(ctx, options) } -func (s *storage) GetConfigMap(ctx api.Context, name string) (*api.ConfigMap, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetConfigMap(ctx api.Context, name string, options *metav1.GetOptions) (*api.ConfigMap, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/registry/core/controller/etcd/etcd.go b/pkg/registry/core/controller/etcd/etcd.go index e43d2817cce..d127c256b16 100644 --- a/pkg/registry/core/controller/etcd/etcd.go +++ b/pkg/registry/core/controller/etcd/etcd.go @@ -26,6 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/controller" @@ -125,8 +126,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. @@ -146,8 +147,8 @@ func (r *ScaleREST) New() runtime.Object { return &autoscaling.Scale{} } -func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { - rc, err := r.registry.GetController(ctx, name) +func (r *ScaleREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + rc, err := r.registry.GetController(ctx, name, options) if err != nil { return nil, errors.NewNotFound(autoscaling.Resource("replicationcontrollers/scale"), name) } @@ -155,7 +156,7 @@ func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { } func (r *ScaleREST) Update(ctx api.Context, name string, objInfo rest.UpdatedObjectInfo) (runtime.Object, bool, error) { - rc, err := r.registry.GetController(ctx, name) + rc, err := r.registry.GetController(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, false, errors.NewNotFound(autoscaling.Resource("replicationcontrollers/scale"), name) } diff --git a/pkg/registry/core/controller/etcd/etcd_test.go b/pkg/registry/core/controller/etcd/etcd_test.go index 9aaa995b8bb..d11988f30d9 100644 --- a/pkg/registry/core/controller/etcd/etcd_test.go +++ b/pkg/registry/core/controller/etcd/etcd_test.go @@ -23,6 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" @@ -151,7 +152,7 @@ func TestGenerationNumber(t *testing.T) { modifiedSno.Status.ObservedGeneration = 10 ctx := api.NewDefaultContext() rc, err := createController(storage.Controller, modifiedSno, t) - ctrl, err := storage.Controller.Get(ctx, rc.Name) + ctrl, err := storage.Controller.Get(ctx, rc.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -168,7 +169,7 @@ func TestGenerationNumber(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - ctrl, err = storage.Controller.Get(ctx, rc.Name) + ctrl, err = storage.Controller.Get(ctx, rc.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -183,7 +184,7 @@ func TestGenerationNumber(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - ctrl, err = storage.Controller.Get(ctx, rc.Name) + ctrl, err = storage.Controller.Get(ctx, rc.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -271,7 +272,7 @@ func TestScaleGet(t *testing.T) { Selector: labels.SelectorFromSet(validController.Spec.Template.Labels).String(), }, } - obj, err := storage.Scale.Get(ctx, name) + obj, err := storage.Scale.Get(ctx, name, &metav1.GetOptions{}) if err != nil { t.Fatalf("error fetching scale for %s: %v", name, err) } @@ -302,7 +303,7 @@ func TestScaleUpdate(t *testing.T) { if _, _, err := storage.Scale.Update(ctx, update.Name, rest.DefaultUpdatedObjectInfo(&update, api.Scheme)); err != nil { t.Fatalf("error updating scale %v: %v", update, err) } - obj, err := storage.Scale.Get(ctx, name) + obj, err := storage.Scale.Get(ctx, name, &metav1.GetOptions{}) if err != nil { t.Fatalf("error fetching scale for %s: %v", name, err) } diff --git a/pkg/registry/core/controller/registry.go b/pkg/registry/core/controller/registry.go index 2455eca8212..859cbae48e3 100644 --- a/pkg/registry/core/controller/registry.go +++ b/pkg/registry/core/controller/registry.go @@ -23,6 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -30,7 +31,7 @@ import ( type Registry interface { ListControllers(ctx api.Context, options *api.ListOptions) (*api.ReplicationControllerList, error) WatchControllers(ctx api.Context, options *api.ListOptions) (watch.Interface, error) - GetController(ctx api.Context, controllerID string) (*api.ReplicationController, error) + GetController(ctx api.Context, controllerID string, options *metav1.GetOptions) (*api.ReplicationController, error) CreateController(ctx api.Context, controller *api.ReplicationController) (*api.ReplicationController, error) UpdateController(ctx api.Context, controller *api.ReplicationController) (*api.ReplicationController, error) DeleteController(ctx api.Context, controllerID string) error @@ -62,8 +63,8 @@ func (s *storage) WatchControllers(ctx api.Context, options *api.ListOptions) (w return s.Watch(ctx, options) } -func (s *storage) GetController(ctx api.Context, controllerID string) (*api.ReplicationController, error) { - obj, err := s.Get(ctx, controllerID) +func (s *storage) GetController(ctx api.Context, controllerID string, options *metav1.GetOptions) (*api.ReplicationController, error) { + obj, err := s.Get(ctx, controllerID, options) if err != nil { return nil, err } diff --git a/pkg/registry/core/endpoint/registry.go b/pkg/registry/core/endpoint/registry.go index fa415921e23..2fa5aa4e7e8 100644 --- a/pkg/registry/core/endpoint/registry.go +++ b/pkg/registry/core/endpoint/registry.go @@ -19,13 +19,14 @@ package endpoint import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface for things that know how to store endpoints. type Registry interface { ListEndpoints(ctx api.Context, options *api.ListOptions) (*api.EndpointsList, error) - GetEndpoints(ctx api.Context, name string) (*api.Endpoints, error) + GetEndpoints(ctx api.Context, name string, options *metav1.GetOptions) (*api.Endpoints, error) WatchEndpoints(ctx api.Context, options *api.ListOptions) (watch.Interface, error) UpdateEndpoints(ctx api.Context, e *api.Endpoints) error DeleteEndpoints(ctx api.Context, name string) error @@ -54,8 +55,8 @@ func (s *storage) WatchEndpoints(ctx api.Context, options *api.ListOptions) (wat return s.Watch(ctx, options) } -func (s *storage) GetEndpoints(ctx api.Context, name string) (*api.Endpoints, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetEndpoints(ctx api.Context, name string, options *metav1.GetOptions) (*api.Endpoints, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/registry/core/namespace/etcd/etcd.go b/pkg/registry/core/namespace/etcd/etcd.go index b07d732d31a..f28d372deb5 100644 --- a/pkg/registry/core/namespace/etcd/etcd.go +++ b/pkg/registry/core/namespace/etcd/etcd.go @@ -101,7 +101,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST, *FinalizeREST) { // Delete enforces life-cycle rules for namespace termination func (r *REST) Delete(ctx api.Context, name string, options *api.DeleteOptions) (runtime.Object, error) { - nsObj, err := r.Get(ctx, name) + nsObj, err := r.Get(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, err } @@ -196,8 +196,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/core/namespace/etcd/etcd_test.go b/pkg/registry/core/namespace/etcd/etcd_test.go index 6f236aa1df6..43772c6cec9 100644 --- a/pkg/registry/core/namespace/etcd/etcd_test.go +++ b/pkg/registry/core/namespace/etcd/etcd_test.go @@ -71,7 +71,7 @@ func TestCreateSetsFields(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - object, err := storage.Get(ctx, "foo") + object, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } diff --git a/pkg/registry/core/namespace/registry.go b/pkg/registry/core/namespace/registry.go index f30857fd47e..1b12bf42ca5 100644 --- a/pkg/registry/core/namespace/registry.go +++ b/pkg/registry/core/namespace/registry.go @@ -19,6 +19,7 @@ package namespace import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -26,7 +27,7 @@ import ( type Registry interface { ListNamespaces(ctx api.Context, options *api.ListOptions) (*api.NamespaceList, error) WatchNamespaces(ctx api.Context, options *api.ListOptions) (watch.Interface, error) - GetNamespace(ctx api.Context, namespaceID string) (*api.Namespace, error) + GetNamespace(ctx api.Context, namespaceID string, options *metav1.GetOptions) (*api.Namespace, error) CreateNamespace(ctx api.Context, namespace *api.Namespace) error UpdateNamespace(ctx api.Context, namespace *api.Namespace) error DeleteNamespace(ctx api.Context, namespaceID string) error @@ -55,8 +56,8 @@ func (s *storage) WatchNamespaces(ctx api.Context, options *api.ListOptions) (wa return s.Watch(ctx, options) } -func (s *storage) GetNamespace(ctx api.Context, namespaceName string) (*api.Namespace, error) { - obj, err := s.Get(ctx, namespaceName) +func (s *storage) GetNamespace(ctx api.Context, namespaceName string, options *metav1.GetOptions) (*api.Namespace, error) { + obj, err := s.Get(ctx, namespaceName, options) if err != nil { return nil, err } diff --git a/pkg/registry/core/node/etcd/etcd.go b/pkg/registry/core/node/etcd/etcd.go index 3b1b1e9a738..535e951265b 100644 --- a/pkg/registry/core/node/etcd/etcd.go +++ b/pkg/registry/core/node/etcd/etcd.go @@ -24,6 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/node" @@ -58,8 +59,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. @@ -118,7 +119,7 @@ func NewStorage(opts generic.RESTOptions, kubeletClientConfig client.KubeletClie // Build a NodeGetter that looks up nodes using the REST handler nodeGetter := client.NodeGetterFunc(func(nodeName string) (*v1.Node, error) { - obj, err := nodeREST.Get(api.NewContext(), nodeName) + obj, err := nodeREST.Get(api.NewContext(), nodeName, &metav1.GetOptions{}) if err != nil { return nil, err } diff --git a/pkg/registry/core/node/registry.go b/pkg/registry/core/node/registry.go index 71e194dcc18..3a0ea4b7129 100644 --- a/pkg/registry/core/node/registry.go +++ b/pkg/registry/core/node/registry.go @@ -19,6 +19,7 @@ package node import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -27,7 +28,7 @@ type Registry interface { ListNodes(ctx api.Context, options *api.ListOptions) (*api.NodeList, error) CreateNode(ctx api.Context, node *api.Node) error UpdateNode(ctx api.Context, node *api.Node) error - GetNode(ctx api.Context, nodeID string) (*api.Node, error) + GetNode(ctx api.Context, nodeID string, options *metav1.GetOptions) (*api.Node, error) DeleteNode(ctx api.Context, nodeID string) error WatchNodes(ctx api.Context, options *api.ListOptions) (watch.Interface, error) } @@ -66,8 +67,8 @@ func (s *storage) WatchNodes(ctx api.Context, options *api.ListOptions) (watch.I return s.Watch(ctx, options) } -func (s *storage) GetNode(ctx api.Context, name string) (*api.Node, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetNode(ctx api.Context, name string, options *metav1.GetOptions) (*api.Node, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/registry/core/node/strategy.go b/pkg/registry/core/node/strategy.go index 00df9b841be..d068d4adeea 100644 --- a/pkg/registry/core/node/strategy.go +++ b/pkg/registry/core/node/strategy.go @@ -25,6 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/labels" @@ -132,7 +133,7 @@ func (nodeStatusStrategy) Canonicalize(obj runtime.Object) { // ResourceGetter is an interface for retrieving resources by ResourceLocation. type ResourceGetter interface { - Get(api.Context, string) (runtime.Object, error) + Get(api.Context, string, *metav1.GetOptions) (runtime.Object, error) } // NodeToSelectableFields returns a field set that represents the object. diff --git a/pkg/registry/core/persistentvolume/etcd/etcd.go b/pkg/registry/core/persistentvolume/etcd/etcd.go index fdb7e75b6ee..7bf94ef5b42 100644 --- a/pkg/registry/core/persistentvolume/etcd/etcd.go +++ b/pkg/registry/core/persistentvolume/etcd/etcd.go @@ -19,6 +19,7 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/persistentvolume" "k8s.io/kubernetes/pkg/registry/generic" @@ -89,8 +90,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/core/persistentvolume/etcd/etcd_test.go b/pkg/registry/core/persistentvolume/etcd/etcd_test.go index afc4835e1d1..fbce436788c 100644 --- a/pkg/registry/core/persistentvolume/etcd/etcd_test.go +++ b/pkg/registry/core/persistentvolume/etcd/etcd_test.go @@ -22,6 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" @@ -177,7 +178,7 @@ func TestUpdateStatus(t *testing.T) { if err != nil { t.Fatalf("Unexpected error: %v", err) } - obj, err := storage.Get(ctx, "foo") + obj, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } diff --git a/pkg/registry/core/persistentvolumeclaim/etcd/etcd.go b/pkg/registry/core/persistentvolumeclaim/etcd/etcd.go index 90eb4b62233..1bd036e169a 100644 --- a/pkg/registry/core/persistentvolumeclaim/etcd/etcd.go +++ b/pkg/registry/core/persistentvolumeclaim/etcd/etcd.go @@ -19,6 +19,7 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim" "k8s.io/kubernetes/pkg/registry/generic" @@ -89,8 +90,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go b/pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go index ca27a260959..6891c39a4d1 100644 --- a/pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go +++ b/pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go @@ -22,6 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" @@ -174,7 +175,7 @@ func TestUpdateStatus(t *testing.T) { if err != nil { t.Fatalf("Unexpected error: %v", err) } - obj, err := storage.Get(ctx, "foo") + obj, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } diff --git a/pkg/registry/core/pod/etcd/etcd.go b/pkg/registry/core/pod/etcd/etcd.go index 06e616210d4..9d9c897e861 100644 --- a/pkg/registry/core/pod/etcd/etcd.go +++ b/pkg/registry/core/pod/etcd/etcd.go @@ -208,8 +208,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/core/pod/etcd/etcd_test.go b/pkg/registry/core/pod/etcd/etcd_test.go index 11d5b8a836b..b69149e6c54 100644 --- a/pkg/registry/core/pod/etcd/etcd_test.go +++ b/pkg/registry/core/pod/etcd/etcd_test.go @@ -25,6 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" @@ -209,7 +210,7 @@ func TestCreateSetsFields(t *testing.T) { t.Fatalf("unexpected error: %v", err) } ctx := api.NewDefaultContext() - object, err := storage.Get(ctx, "foo") + object, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -400,7 +401,7 @@ func TestEtcdCreate(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - _, err = storage.Get(ctx, "foo") + _, err = storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("Unexpected error %v", err) } @@ -429,7 +430,7 @@ func TestEtcdCreateBindingNoPod(t *testing.T) { t.Fatalf("Unexpected error returned: %#v", err) } - _, err = storage.Get(ctx, "foo") + _, err = storage.Get(ctx, "foo", &metav1.GetOptions{}) if err == nil { t.Fatalf("Expected not-found-error but got nothing") } @@ -474,7 +475,7 @@ func TestEtcdCreateWithContainersNotFound(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - obj, err := storage.Get(ctx, "foo") + obj, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("Unexpected error %v", err) } @@ -535,7 +536,7 @@ func TestEtcdCreateWithExistingContainers(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - _, err = storage.Get(ctx, "foo") + _, err = storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("Unexpected error %v", err) } @@ -587,7 +588,7 @@ func TestEtcdCreateBinding(t *testing.T) { t.Errorf("%s: unexpected error: %v", k, err) } else if err == nil { // If bind succeeded, verify Host field in pod's Spec. - pod, err := storage.Get(ctx, validNewPod().ObjectMeta.Name) + pod, err := storage.Get(ctx, validNewPod().ObjectMeta.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("%s: unexpected error: %v", k, err) } else if pod.(*api.Pod).Spec.NodeName != test.binding.Target.Name { @@ -614,7 +615,7 @@ func TestEtcdUpdateNotScheduled(t *testing.T) { if err != nil { t.Errorf("Unexpected error: %v", err) } - obj, err := storage.Get(ctx, validNewPod().ObjectMeta.Name) + obj, err := storage.Get(ctx, validNewPod().ObjectMeta.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -682,7 +683,7 @@ func TestEtcdUpdateScheduled(t *testing.T) { t.Errorf("Unexpected error: %v", err) } - obj, err := storage.Get(ctx, "foo") + obj, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %v", err) } @@ -762,7 +763,7 @@ func TestEtcdUpdateStatus(t *testing.T) { if err != nil { t.Fatalf("Unexpected error: %v", err) } - obj, err := storage.Get(ctx, "foo") + obj, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } diff --git a/pkg/registry/core/pod/etcd/eviction.go b/pkg/registry/core/pod/etcd/eviction.go index 6db49e81203..fdafb1e3da9 100644 --- a/pkg/registry/core/pod/etcd/eviction.go +++ b/pkg/registry/core/pod/etcd/eviction.go @@ -73,7 +73,7 @@ func (r *EvictionREST) New() runtime.Object { func (r *EvictionREST) Create(ctx api.Context, obj runtime.Object) (runtime.Object, error) { eviction := obj.(*policy.Eviction) - obj, err := r.store.Get(ctx, eviction.Name) + obj, err := r.store.Get(ctx, eviction.Name, &metav1.GetOptions{}) if err != nil { return nil, err } diff --git a/pkg/registry/core/pod/strategy.go b/pkg/registry/core/pod/strategy.go index 3cabf7a35a7..79db2061ad1 100644 --- a/pkg/registry/core/pod/strategy.go +++ b/pkg/registry/core/pod/strategy.go @@ -28,6 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/labels" @@ -196,11 +197,11 @@ func PodToSelectableFields(pod *api.Pod) fields.Set { // ResourceGetter is an interface for retrieving resources by ResourceLocation. type ResourceGetter interface { - Get(api.Context, string) (runtime.Object, error) + Get(api.Context, string, *metav1.GetOptions) (runtime.Object, error) } func getPod(getter ResourceGetter, ctx api.Context, name string) (*api.Pod, error) { - obj, err := getter.Get(ctx, name) + obj, err := getter.Get(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, err } diff --git a/pkg/registry/core/pod/strategy_test.go b/pkg/registry/core/pod/strategy_test.go index e900c65623f..0e6bf68e381 100644 --- a/pkg/registry/core/pod/strategy_test.go +++ b/pkg/registry/core/pod/strategy_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" @@ -149,7 +150,7 @@ type mockPodGetter struct { pod *api.Pod } -func (g mockPodGetter) Get(api.Context, string) (runtime.Object, error) { +func (g mockPodGetter) Get(api.Context, string, *metav1.GetOptions) (runtime.Object, error) { return g.pod, nil } diff --git a/pkg/registry/core/resourcequota/etcd/etcd.go b/pkg/registry/core/resourcequota/etcd/etcd.go index 523962b851f..a02982d9b83 100644 --- a/pkg/registry/core/resourcequota/etcd/etcd.go +++ b/pkg/registry/core/resourcequota/etcd/etcd.go @@ -19,6 +19,7 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/resourcequota" "k8s.io/kubernetes/pkg/registry/generic" @@ -89,8 +90,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/core/resourcequota/etcd/etcd_test.go b/pkg/registry/core/resourcequota/etcd/etcd_test.go index b273a8994dd..c600e7443a3 100644 --- a/pkg/registry/core/resourcequota/etcd/etcd_test.go +++ b/pkg/registry/core/resourcequota/etcd/etcd_test.go @@ -22,6 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" @@ -84,7 +85,7 @@ func TestCreateSetsFields(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - object, err := storage.Get(ctx, "foo") + object, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -187,7 +188,7 @@ func TestUpdateStatus(t *testing.T) { if err != nil { t.Fatalf("Unexpected error: %v", err) } - obj, err := storage.Get(ctx, "foo") + obj, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) rqOut := obj.(*api.ResourceQuota) // only compare the meaningful update b/c we can't compare due to metadata if !api.Semantic.DeepEqual(resourcequotaIn.Status, rqOut.Status) { diff --git a/pkg/registry/core/secret/registry.go b/pkg/registry/core/secret/registry.go index 03d948c3d81..a15f6041083 100644 --- a/pkg/registry/core/secret/registry.go +++ b/pkg/registry/core/secret/registry.go @@ -19,6 +19,7 @@ package secret import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -26,7 +27,7 @@ import ( type Registry interface { ListSecrets(ctx api.Context, options *api.ListOptions) (*api.SecretList, error) WatchSecrets(ctx api.Context, options *api.ListOptions) (watch.Interface, error) - GetSecret(ctx api.Context, name string) (*api.Secret, error) + GetSecret(ctx api.Context, name string, options *metav1.GetOptions) (*api.Secret, error) CreateSecret(ctx api.Context, Secret *api.Secret) (*api.Secret, error) UpdateSecret(ctx api.Context, Secret *api.Secret) (*api.Secret, error) DeleteSecret(ctx api.Context, name string) error @@ -55,8 +56,8 @@ func (s *storage) WatchSecrets(ctx api.Context, options *api.ListOptions) (watch return s.Watch(ctx, options) } -func (s *storage) GetSecret(ctx api.Context, name string) (*api.Secret, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetSecret(ctx api.Context, name string, options *metav1.GetOptions) (*api.Secret, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/registry/core/service/etcd/etcd.go b/pkg/registry/core/service/etcd/etcd.go index 6c230d162c8..c0bc4494258 100644 --- a/pkg/registry/core/service/etcd/etcd.go +++ b/pkg/registry/core/service/etcd/etcd.go @@ -19,6 +19,7 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/service" "k8s.io/kubernetes/pkg/registry/generic" @@ -87,8 +88,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/core/service/registry.go b/pkg/registry/core/service/registry.go index 1a0fa1df610..578e70c5954 100644 --- a/pkg/registry/core/service/registry.go +++ b/pkg/registry/core/service/registry.go @@ -29,7 +29,7 @@ import ( type Registry interface { ListServices(ctx api.Context, options *api.ListOptions) (*api.ServiceList, error) CreateService(ctx api.Context, svc *api.Service) (*api.Service, error) - GetService(ctx api.Context, name string) (*api.Service, error) + GetService(ctx api.Context, name string, options *metav1.GetOptions) (*api.Service, error) DeleteService(ctx api.Context, name string) error UpdateService(ctx api.Context, svc *api.Service) (*api.Service, error) WatchServices(ctx api.Context, options *api.ListOptions) (watch.Interface, error) @@ -63,8 +63,8 @@ func (s *storage) CreateService(ctx api.Context, svc *api.Service) (*api.Service return obj.(*api.Service), nil } -func (s *storage) GetService(ctx api.Context, name string) (*api.Service, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetService(ctx api.Context, name string, options *metav1.GetOptions) (*api.Service, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/registry/core/service/rest.go b/pkg/registry/core/service/rest.go index 5b3fb1d1abe..629bc2ed1d7 100644 --- a/pkg/registry/core/service/rest.go +++ b/pkg/registry/core/service/rest.go @@ -206,7 +206,7 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (runtime.Object, err } func (rs *REST) Delete(ctx api.Context, id string) (runtime.Object, error) { - service, err := rs.registry.GetService(ctx, id) + service, err := rs.registry.GetService(ctx, id, &metav1.GetOptions{}) if err != nil { return nil, err } @@ -248,8 +248,8 @@ func (rs *REST) Delete(ctx api.Context, id string) (runtime.Object, error) { return &metav1.Status{Status: metav1.StatusSuccess}, nil } -func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) { - return rs.registry.GetService(ctx, id) +func (rs *REST) Get(ctx api.Context, id string, options *metav1.GetOptions) (runtime.Object, error) { + return rs.registry.GetService(ctx, id, options) } func (rs *REST) List(ctx api.Context, options *api.ListOptions) (runtime.Object, error) { @@ -369,7 +369,7 @@ func (rs *REST) healthCheckNodePortUpdate(oldService, service *api.Service) (boo } func (rs *REST) Update(ctx api.Context, name string, objInfo rest.UpdatedObjectInfo) (runtime.Object, bool, error) { - oldService, err := rs.registry.GetService(ctx, name) + oldService, err := rs.registry.GetService(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, false, err } @@ -476,7 +476,7 @@ func (rs *REST) ResourceLocation(ctx api.Context, id string) (*url.URL, http.Rou // If a port *number* was specified, find the corresponding service port name if portNum, err := strconv.ParseInt(portStr, 10, 64); err == nil { - svc, err := rs.registry.GetService(ctx, svcName) + svc, err := rs.registry.GetService(ctx, svcName, &metav1.GetOptions{}) if err != nil { return nil, nil, err } @@ -494,7 +494,7 @@ func (rs *REST) ResourceLocation(ctx api.Context, id string) (*url.URL, http.Rou } } - eps, err := rs.endpoints.GetEndpoints(ctx, svcName) + eps, err := rs.endpoints.GetEndpoints(ctx, svcName, &metav1.GetOptions{}) if err != nil { return nil, nil, err } diff --git a/pkg/registry/core/service/rest_test.go b/pkg/registry/core/service/rest_test.go index b479a039933..caf8d5b6dff 100644 --- a/pkg/registry/core/service/rest_test.go +++ b/pkg/registry/core/service/rest_test.go @@ -26,6 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/service" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/registry/registrytest" @@ -107,7 +108,7 @@ func TestServiceRegistryCreate(t *testing.T) { if !makeIPNet(t).Contains(net.ParseIP(created_service.Spec.ClusterIP)) { t.Errorf("Unexpected ClusterIP: %s", created_service.Spec.ClusterIP) } - srv, err := registry.GetService(ctx, svc.Name) + srv, err := registry.GetService(ctx, svc.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -225,7 +226,7 @@ func TestServiceRegistryCreateMultiNodePortsService(t *testing.T) { if !reflect.DeepEqual(serviceNodePorts, test.expectNodePorts) { t.Errorf("Expected %v, but got %v", test.expectNodePorts, serviceNodePorts) } - srv, err := registry.GetService(ctx, test.name) + srv, err := registry.GetService(ctx, test.name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -410,7 +411,7 @@ func TestServiceRegistryExternalService(t *testing.T) { if err != nil { t.Errorf("Failed to create service: %#v", err) } - srv, err := registry.GetService(ctx, svc.Name) + srv, err := registry.GetService(ctx, svc.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %v", err) } @@ -545,7 +546,7 @@ func TestServiceRegistryGet(t *testing.T) { Selector: map[string]string{"bar": "baz"}, }, }) - storage.Get(ctx, "foo") + storage.Get(ctx, "foo", &metav1.GetOptions{}) if e, a := "foo", registry.GottenID; e != a { t.Errorf("Expected %v, but got %v", e, a) } diff --git a/pkg/registry/core/serviceaccount/registry.go b/pkg/registry/core/serviceaccount/registry.go index 7e5635dad0e..38c7c159cc8 100644 --- a/pkg/registry/core/serviceaccount/registry.go +++ b/pkg/registry/core/serviceaccount/registry.go @@ -19,6 +19,7 @@ package serviceaccount import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -26,7 +27,7 @@ import ( type Registry interface { ListServiceAccounts(ctx api.Context, options *api.ListOptions) (*api.ServiceAccountList, error) WatchServiceAccounts(ctx api.Context, options *api.ListOptions) (watch.Interface, error) - GetServiceAccount(ctx api.Context, name string) (*api.ServiceAccount, error) + GetServiceAccount(ctx api.Context, name string, options *metav1.GetOptions) (*api.ServiceAccount, error) CreateServiceAccount(ctx api.Context, ServiceAccount *api.ServiceAccount) error UpdateServiceAccount(ctx api.Context, ServiceAccount *api.ServiceAccount) error DeleteServiceAccount(ctx api.Context, name string) error @@ -55,8 +56,8 @@ func (s *storage) WatchServiceAccounts(ctx api.Context, options *api.ListOptions return s.Watch(ctx, options) } -func (s *storage) GetServiceAccount(ctx api.Context, name string) (*api.ServiceAccount, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetServiceAccount(ctx api.Context, name string, options *metav1.GetOptions) (*api.ServiceAccount, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/registry/extensions/controller/etcd/etcd.go b/pkg/registry/extensions/controller/etcd/etcd.go index 5e27a08560e..8b947afb990 100644 --- a/pkg/registry/extensions/controller/etcd/etcd.go +++ b/pkg/registry/extensions/controller/etcd/etcd.go @@ -62,8 +62,8 @@ func (r *ScaleREST) New() runtime.Object { return &extensions.Scale{} } -func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { - rc, err := (*r.registry).GetController(ctx, name) +func (r *ScaleREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + rc, err := (*r.registry).GetController(ctx, name, options) if err != nil { return nil, errors.NewNotFound(extensions.Resource("replicationcontrollers/scale"), name) } @@ -71,7 +71,7 @@ func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { } func (r *ScaleREST) Update(ctx api.Context, name string, objInfo rest.UpdatedObjectInfo) (runtime.Object, bool, error) { - rc, err := (*r.registry).GetController(ctx, name) + rc, err := (*r.registry).GetController(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, false, errors.NewNotFound(extensions.Resource("replicationcontrollers/scale"), name) } diff --git a/pkg/registry/extensions/controller/etcd/etcd_test.go b/pkg/registry/extensions/controller/etcd/etcd_test.go index 856bbfcf86c..c0a17645892 100644 --- a/pkg/registry/extensions/controller/etcd/etcd_test.go +++ b/pkg/registry/extensions/controller/etcd/etcd_test.go @@ -95,7 +95,7 @@ func TestGet(t *testing.T) { if err := si.Create(ctx, key, &validController, nil, 0); err != nil { t.Fatalf("unexpected error: %v", err) } - obj, err := storage.Get(ctx, "foo") + obj, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -125,7 +125,7 @@ func TestUpdate(t *testing.T) { if _, _, err := storage.Update(ctx, update.Name, rest.DefaultUpdatedObjectInfo(&update, api.Scheme)); err != nil { t.Fatalf("unexpected error: %v", err) } - obj, err := storage.Get(ctx, "foo") + obj, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/registry/extensions/daemonset/etcd/etcd.go b/pkg/registry/extensions/daemonset/etcd/etcd.go index 8a6e66b7f9b..afeb8b9b470 100644 --- a/pkg/registry/extensions/daemonset/etcd/etcd.go +++ b/pkg/registry/extensions/daemonset/etcd/etcd.go @@ -20,6 +20,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/daemonset" "k8s.io/kubernetes/pkg/registry/generic" @@ -100,8 +101,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/extensions/deployment/etcd/etcd.go b/pkg/registry/extensions/deployment/etcd/etcd.go index ec07eca7c91..f32f5c37ddf 100644 --- a/pkg/registry/extensions/deployment/etcd/etcd.go +++ b/pkg/registry/extensions/deployment/etcd/etcd.go @@ -124,8 +124,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. @@ -214,8 +214,8 @@ func (r *ScaleREST) New() runtime.Object { return &extensions.Scale{} } -func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { - deployment, err := r.registry.GetDeployment(ctx, name) +func (r *ScaleREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + deployment, err := r.registry.GetDeployment(ctx, name, options) if err != nil { return nil, errors.NewNotFound(extensions.Resource("deployments/scale"), name) } @@ -227,7 +227,7 @@ func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { } func (r *ScaleREST) Update(ctx api.Context, name string, objInfo rest.UpdatedObjectInfo) (runtime.Object, bool, error) { - deployment, err := r.registry.GetDeployment(ctx, name) + deployment, err := r.registry.GetDeployment(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, false, errors.NewNotFound(extensions.Resource("deployments/scale"), name) } diff --git a/pkg/registry/extensions/deployment/etcd/etcd_test.go b/pkg/registry/extensions/deployment/etcd/etcd_test.go index 774438839c8..cd757dd410e 100644 --- a/pkg/registry/extensions/deployment/etcd/etcd_test.go +++ b/pkg/registry/extensions/deployment/etcd/etcd_test.go @@ -219,7 +219,7 @@ func TestScaleGet(t *testing.T) { Selector: validDeployment.Spec.Selector, }, } - obj, err := storage.Scale.Get(ctx, name) + obj, err := storage.Scale.Get(ctx, name, &metav1.GetOptions{}) if err != nil { t.Fatalf("error fetching scale for %s: %v", name, err) } @@ -250,7 +250,7 @@ func TestScaleUpdate(t *testing.T) { if _, _, err := storage.Scale.Update(ctx, update.Name, rest.DefaultUpdatedObjectInfo(&update, api.Scheme)); err != nil { t.Fatalf("error updating scale %v: %v", update, err) } - obj, err := storage.Scale.Get(ctx, name) + obj, err := storage.Scale.Get(ctx, name, &metav1.GetOptions{}) if err != nil { t.Fatalf("error fetching scale for %s: %v", name, err) } @@ -289,7 +289,7 @@ func TestStatusUpdate(t *testing.T) { if _, _, err := storage.Status.Update(ctx, update.Name, rest.DefaultUpdatedObjectInfo(&update, api.Scheme)); err != nil { t.Fatalf("unexpected error: %v", err) } - obj, err := storage.Deployment.Get(ctx, name) + obj, err := storage.Deployment.Get(ctx, name, &metav1.GetOptions{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -344,7 +344,7 @@ func TestEtcdCreateDeploymentRollback(t *testing.T) { t.Errorf("%s: unexpected error: %v", k, err) } else if err == nil { // If rollback succeeded, verify Rollback field of deployment - d, err := storage.Deployment.Get(ctx, validNewDeployment().ObjectMeta.Name) + d, err := storage.Deployment.Get(ctx, validNewDeployment().ObjectMeta.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("%s: unexpected error: %v", k, err) } else if !reflect.DeepEqual(*d.(*extensions.Deployment).Spec.RollbackTo, test.rollback.RollbackTo) { @@ -377,7 +377,7 @@ func TestEtcdCreateDeploymentRollbackNoDeployment(t *testing.T) { t.Fatalf("Unexpected error returned: %#v", err) } - _, err = storage.Deployment.Get(ctx, name) + _, err = storage.Deployment.Get(ctx, name, &metav1.GetOptions{}) if err == nil { t.Fatalf("Expected not-found-error but got nothing") } diff --git a/pkg/registry/extensions/deployment/registry.go b/pkg/registry/extensions/deployment/registry.go index 73a02288cf8..bd4ace1d486 100644 --- a/pkg/registry/extensions/deployment/registry.go +++ b/pkg/registry/extensions/deployment/registry.go @@ -22,12 +22,13 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // Registry is an interface for things that know how to store Deployments. type Registry interface { ListDeployments(ctx api.Context, options *api.ListOptions) (*extensions.DeploymentList, error) - GetDeployment(ctx api.Context, deploymentID string) (*extensions.Deployment, error) + GetDeployment(ctx api.Context, deploymentID string, options *metav1.GetOptions) (*extensions.Deployment, error) CreateDeployment(ctx api.Context, deployment *extensions.Deployment) (*extensions.Deployment, error) UpdateDeployment(ctx api.Context, deployment *extensions.Deployment) (*extensions.Deployment, error) DeleteDeployment(ctx api.Context, deploymentID string) error @@ -54,8 +55,8 @@ func (s *storage) ListDeployments(ctx api.Context, options *api.ListOptions) (*e return obj.(*extensions.DeploymentList), err } -func (s *storage) GetDeployment(ctx api.Context, deploymentID string) (*extensions.Deployment, error) { - obj, err := s.Get(ctx, deploymentID) +func (s *storage) GetDeployment(ctx api.Context, deploymentID string, options *metav1.GetOptions) (*extensions.Deployment, error) { + obj, err := s.Get(ctx, deploymentID, options) if err != nil { return nil, err } diff --git a/pkg/registry/extensions/ingress/etcd/etcd.go b/pkg/registry/extensions/ingress/etcd/etcd.go index dc61878c56c..3cd9b2dc0c2 100644 --- a/pkg/registry/extensions/ingress/etcd/etcd.go +++ b/pkg/registry/extensions/ingress/etcd/etcd.go @@ -20,6 +20,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/cachesize" ingress "k8s.io/kubernetes/pkg/registry/extensions/ingress" "k8s.io/kubernetes/pkg/registry/generic" @@ -99,8 +100,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/extensions/replicaset/etcd/etcd.go b/pkg/registry/extensions/replicaset/etcd/etcd.go index 1eab9ac2761..d7601b21092 100644 --- a/pkg/registry/extensions/replicaset/etcd/etcd.go +++ b/pkg/registry/extensions/replicaset/etcd/etcd.go @@ -26,6 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/replicaset" "k8s.io/kubernetes/pkg/registry/generic" @@ -123,8 +124,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. @@ -144,8 +145,8 @@ func (r *ScaleREST) New() runtime.Object { return &extensions.Scale{} } -func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { - rs, err := r.registry.GetReplicaSet(ctx, name) +func (r *ScaleREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + rs, err := r.registry.GetReplicaSet(ctx, name, options) if err != nil { return nil, errors.NewNotFound(extensions.Resource("replicasets/scale"), name) } @@ -157,7 +158,7 @@ func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { } func (r *ScaleREST) Update(ctx api.Context, name string, objInfo rest.UpdatedObjectInfo) (runtime.Object, bool, error) { - rs, err := r.registry.GetReplicaSet(ctx, name) + rs, err := r.registry.GetReplicaSet(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, false, errors.NewNotFound(extensions.Resource("replicasets/scale"), name) } diff --git a/pkg/registry/extensions/replicaset/etcd/etcd_test.go b/pkg/registry/extensions/replicaset/etcd/etcd_test.go index a39a38c1de9..9a6f0d10194 100644 --- a/pkg/registry/extensions/replicaset/etcd/etcd_test.go +++ b/pkg/registry/extensions/replicaset/etcd/etcd_test.go @@ -153,7 +153,7 @@ func TestGenerationNumber(t *testing.T) { modifiedSno.Status.ObservedGeneration = 10 ctx := api.NewDefaultContext() rs, err := createReplicaSet(storage.ReplicaSet, modifiedSno, t) - etcdRS, err := storage.ReplicaSet.Get(ctx, rs.Name) + etcdRS, err := storage.ReplicaSet.Get(ctx, rs.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -170,7 +170,7 @@ func TestGenerationNumber(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - etcdRS, err = storage.ReplicaSet.Get(ctx, rs.Name) + etcdRS, err = storage.ReplicaSet.Get(ctx, rs.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -185,7 +185,7 @@ func TestGenerationNumber(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - etcdRS, err = storage.ReplicaSet.Get(ctx, rs.Name) + etcdRS, err = storage.ReplicaSet.Get(ctx, rs.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -274,7 +274,7 @@ func TestScaleGet(t *testing.T) { Selector: validReplicaSet.Spec.Selector, }, } - obj, err := storage.Scale.Get(ctx, name) + obj, err := storage.Scale.Get(ctx, name, &metav1.GetOptions{}) got := obj.(*extensions.Scale) if err != nil { t.Fatalf("error fetching scale for %s: %v", name, err) @@ -312,7 +312,7 @@ func TestScaleUpdate(t *testing.T) { t.Fatalf("error updating scale %v: %v", update, err) } - obj, err := storage.Scale.Get(ctx, name) + obj, err := storage.Scale.Get(ctx, name, &metav1.GetOptions{}) if err != nil { t.Fatalf("error fetching scale for %s: %v", name, err) } @@ -352,7 +352,7 @@ func TestStatusUpdate(t *testing.T) { if _, _, err := storage.Status.Update(ctx, update.Name, rest.DefaultUpdatedObjectInfo(&update, api.Scheme)); err != nil { t.Fatalf("unexpected error: %v", err) } - obj, err := storage.ReplicaSet.Get(ctx, "foo") + obj, err := storage.ReplicaSet.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/registry/extensions/replicaset/registry.go b/pkg/registry/extensions/replicaset/registry.go index 16202919bc7..319956bf8c0 100644 --- a/pkg/registry/extensions/replicaset/registry.go +++ b/pkg/registry/extensions/replicaset/registry.go @@ -24,6 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -31,7 +32,7 @@ import ( type Registry interface { ListReplicaSets(ctx api.Context, options *api.ListOptions) (*extensions.ReplicaSetList, error) WatchReplicaSets(ctx api.Context, options *api.ListOptions) (watch.Interface, error) - GetReplicaSet(ctx api.Context, replicaSetID string) (*extensions.ReplicaSet, error) + GetReplicaSet(ctx api.Context, replicaSetID string, options *metav1.GetOptions) (*extensions.ReplicaSet, error) CreateReplicaSet(ctx api.Context, replicaSet *extensions.ReplicaSet) (*extensions.ReplicaSet, error) UpdateReplicaSet(ctx api.Context, replicaSet *extensions.ReplicaSet) (*extensions.ReplicaSet, error) DeleteReplicaSet(ctx api.Context, replicaSetID string) error @@ -63,8 +64,8 @@ func (s *storage) WatchReplicaSets(ctx api.Context, options *api.ListOptions) (w return s.Watch(ctx, options) } -func (s *storage) GetReplicaSet(ctx api.Context, replicaSetID string) (*extensions.ReplicaSet, error) { - obj, err := s.Get(ctx, replicaSetID) +func (s *storage) GetReplicaSet(ctx api.Context, replicaSetID string, options *metav1.GetOptions) (*extensions.ReplicaSet, error) { + obj, err := s.Get(ctx, replicaSetID, options) if err != nil { return nil, err } diff --git a/pkg/registry/extensions/thirdpartyresourcedata/registry.go b/pkg/registry/extensions/thirdpartyresourcedata/registry.go index 87f1156ec1f..810601d9e21 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/registry.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/registry.go @@ -20,6 +20,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -27,7 +28,7 @@ import ( type Registry interface { ListThirdPartyResourceData(ctx api.Context, options *api.ListOptions) (*extensions.ThirdPartyResourceDataList, error) WatchThirdPartyResourceData(ctx api.Context, options *api.ListOptions) (watch.Interface, error) - GetThirdPartyResourceData(ctx api.Context, name string) (*extensions.ThirdPartyResourceData, error) + GetThirdPartyResourceData(ctx api.Context, name string, options *metav1.GetOptions) (*extensions.ThirdPartyResourceData, error) CreateThirdPartyResourceData(ctx api.Context, resource *extensions.ThirdPartyResourceData) (*extensions.ThirdPartyResourceData, error) UpdateThirdPartyResourceData(ctx api.Context, resource *extensions.ThirdPartyResourceData) (*extensions.ThirdPartyResourceData, error) DeleteThirdPartyResourceData(ctx api.Context, name string) error @@ -56,8 +57,8 @@ func (s *storage) WatchThirdPartyResourceData(ctx api.Context, options *api.List return s.Watch(ctx, options) } -func (s *storage) GetThirdPartyResourceData(ctx api.Context, name string) (*extensions.ThirdPartyResourceData, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetThirdPartyResourceData(ctx api.Context, name string, options *metav1.GetOptions) (*extensions.ThirdPartyResourceData, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/registry/generic/registry/store.go b/pkg/registry/generic/registry/store.go index d61d2835c4a..61d8a9f2e6a 100644 --- a/pkg/registry/generic/registry/store.go +++ b/pkg/registry/generic/registry/store.go @@ -479,14 +479,13 @@ func (e *Store) Update(ctx api.Context, name string, objInfo rest.UpdatedObjectI } // Get retrieves the item from storage. -func (e *Store) Get(ctx api.Context, name string) (runtime.Object, error) { +func (e *Store) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { obj := e.NewFunc() key, err := e.KeyFunc(ctx, name) if err != nil { return nil, err } - // TODO: Once we pass GetOptions to this method, pass the ResourceVersion from it. - if err := e.Storage.Get(ctx, key, "", obj, false); err != nil { + if err := e.Storage.Get(ctx, key, options.ResourceVersion, obj, false); err != nil { return nil, storeerr.InterpretGetError(err, e.QualifiedResource, name) } if e.Decorator != nil { @@ -936,7 +935,7 @@ func exportObjectMeta(accessor meta.Object, exact bool) { // Implements the rest.Exporter interface func (e *Store) Export(ctx api.Context, name string, opts metav1.ExportOptions) (runtime.Object, error) { - obj, err := e.Get(ctx, name) + obj, err := e.Get(ctx, name, &metav1.GetOptions{}) if err != nil { return nil, err } diff --git a/pkg/registry/generic/registry/store_test.go b/pkg/registry/generic/registry/store_test.go index 567897c55db..0d628fb40ac 100644 --- a/pkg/registry/generic/registry/store_test.go +++ b/pkg/registry/generic/registry/store_test.go @@ -296,7 +296,7 @@ func TestStoreCreate(t *testing.T) { } // get the object - checkobj, err := registry.Get(testContext, podA.Name) + checkobj, err := registry.Get(testContext, podA.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %v", err) } @@ -344,7 +344,7 @@ func updateAndVerify(t *testing.T, ctx api.Context, registry *Store, pod *api.Po t.Errorf("Unexpected error: %v", err) return false } - checkObj, err := registry.Get(ctx, pod.Name) + checkObj, err := registry.Get(ctx, pod.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %v", err) return false @@ -429,7 +429,7 @@ func TestNoOpUpdates(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } - createdPod, err := registry.Get(api.NewDefaultContext(), "foo") + createdPod, err := registry.Get(api.NewDefaultContext(), "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("Unexpected error: %v", err) } @@ -445,7 +445,7 @@ func TestNoOpUpdates(t *testing.T) { t.Errorf("no-op update should return a correct value, got: %#v", updateResult) } - updatedPod, err := registry.Get(api.NewDefaultContext(), "foo") + updatedPod, err := registry.Get(api.NewDefaultContext(), "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("Unexpected error: %v", err) } @@ -572,7 +572,7 @@ func TestStoreGet(t *testing.T) { destroyFunc, registry := NewTestGenericStoreRegistry(t) defer destroyFunc() - _, err := registry.Get(testContext, podA.Name) + _, err := registry.Get(testContext, podA.Name, &metav1.GetOptions{}) if !errors.IsNotFound(err) { t.Errorf("Unexpected error: %v", err) } @@ -612,7 +612,7 @@ func TestStoreDelete(t *testing.T) { } // try to get a item which should be deleted - _, err = registry.Get(testContext, podA.Name) + _, err = registry.Get(testContext, podA.Name, &metav1.GetOptions{}) if !errors.IsNotFound(err) { t.Errorf("Unexpected error: %v", err) } @@ -679,7 +679,7 @@ func TestGracefulStoreHandleFinalizers(t *testing.T) { if err != nil { t.Fatalf("Unexpected error: %v", err) } - _, err = registry.Get(testContext, podWithFinalizer.Name) + _, err = registry.Get(testContext, podWithFinalizer.Name, &metav1.GetOptions{}) if err != nil { t.Fatalf("Unexpected error: %v", err) } @@ -694,7 +694,7 @@ func TestGracefulStoreHandleFinalizers(t *testing.T) { } // the object should still exist, because it still has a finalizer - _, err = registry.Get(testContext, podWithFinalizer.Name) + _, err = registry.Get(testContext, podWithFinalizer.Name, &metav1.GetOptions{}) if err != nil { t.Fatalf("Unexpected error: %v", err) } @@ -708,7 +708,7 @@ func TestGracefulStoreHandleFinalizers(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } // the pod should be removed, because its finalizer is removed - _, err = registry.Get(testContext, podWithFinalizer.Name) + _, err = registry.Get(testContext, podWithFinalizer.Name, &metav1.GetOptions{}) if !errors.IsNotFound(err) { t.Fatalf("Unexpected error: %v", err) } @@ -738,7 +738,7 @@ func TestNonGracefulStoreHandleFinalizers(t *testing.T) { } // the object should still exist - obj, err := registry.Get(testContext, podWithFinalizer.Name) + obj, err := registry.Get(testContext, podWithFinalizer.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %v", err) } @@ -766,7 +766,7 @@ func TestNonGracefulStoreHandleFinalizers(t *testing.T) { } // the object should still exist, because it still has a finalizer - obj, err = registry.Get(testContext, podWithFinalizer.Name) + obj, err = registry.Get(testContext, podWithFinalizer.Name, &metav1.GetOptions{}) if err != nil { t.Errorf("Unexpected error: %v", err) } @@ -784,7 +784,7 @@ func TestNonGracefulStoreHandleFinalizers(t *testing.T) { t.Errorf("Unexpected error: %v", err) } // the pod should be removed, because its finalizer is removed - _, err = registry.Get(testContext, podWithFinalizer.Name) + _, err = registry.Get(testContext, podWithFinalizer.Name, &metav1.GetOptions{}) if !errors.IsNotFound(err) { t.Errorf("Unexpected error: %v", err) } @@ -1032,7 +1032,7 @@ func TestStoreDeleteWithOrphanDependents(t *testing.T) { if err != nil { t.Fatalf("Unexpected error: %v", err) } - obj, err := registry.Get(testContext, tc.pod.Name) + obj, err := registry.Get(testContext, tc.pod.Name, &metav1.GetOptions{}) if tc.expectNotFound && (err == nil || !errors.IsNotFound(err)) { t.Fatalf("Unexpected error: %v", err) } @@ -1085,10 +1085,10 @@ func TestStoreDeleteCollection(t *testing.T) { t.Errorf("Unexpected number of pods deleted: %d, expected: 2", len(deletedPods.Items)) } - if _, err := registry.Get(testContext, podA.Name); !errors.IsNotFound(err) { + if _, err := registry.Get(testContext, podA.Name, &metav1.GetOptions{}); !errors.IsNotFound(err) { t.Errorf("Unexpected error: %v", err) } - if _, err := registry.Get(testContext, podB.Name); !errors.IsNotFound(err) { + if _, err := registry.Get(testContext, podB.Name, &metav1.GetOptions{}); !errors.IsNotFound(err) { t.Errorf("Unexpected error: %v", err) } } @@ -1125,10 +1125,10 @@ func TestStoreDeleteCollectionNotFound(t *testing.T) { } wg.Wait() - if _, err := registry.Get(testContext, podA.Name); !errors.IsNotFound(err) { + if _, err := registry.Get(testContext, podA.Name, &metav1.GetOptions{}); !errors.IsNotFound(err) { t.Errorf("Unexpected error: %v", err) } - if _, err := registry.Get(testContext, podB.Name); !errors.IsNotFound(err) { + if _, err := registry.Get(testContext, podB.Name, &metav1.GetOptions{}); !errors.IsNotFound(err) { t.Errorf("Unexpected error: %v", err) } } diff --git a/pkg/registry/policy/poddisruptionbudget/etcd/etcd.go b/pkg/registry/policy/poddisruptionbudget/etcd/etcd.go index 8ca2859dd08..63ea31a3344 100644 --- a/pkg/registry/policy/poddisruptionbudget/etcd/etcd.go +++ b/pkg/registry/policy/poddisruptionbudget/etcd/etcd.go @@ -19,6 +19,7 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" policyapi "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" @@ -99,8 +100,8 @@ func (r *StatusREST) New() runtime.Object { } // Get retrieves the object from the storage. It is required to support Patch. -func (r *StatusREST) Get(ctx api.Context, name string) (runtime.Object, error) { - return r.store.Get(ctx, name) +func (r *StatusREST) Get(ctx api.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { + return r.store.Get(ctx, name, options) } // Update alters the status subset of an object. diff --git a/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go b/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go index 345aeb87894..028618312ef 100644 --- a/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go +++ b/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go @@ -91,7 +91,7 @@ func TestStatusUpdate(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - obj, err := storage.Get(ctx, "foo") + obj, err := storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("failed to get pdb: %v", err) } @@ -110,7 +110,7 @@ func TestStatusUpdate(t *testing.T) { if _, _, err := statusStorage.Update(ctx, update.Name, rest.DefaultUpdatedObjectInfo(&update, api.Scheme)); err != nil { t.Fatalf("unexpected error: %v", err) } - obj, err = storage.Get(ctx, "foo") + obj, err = storage.Get(ctx, "foo", &metav1.GetOptions{}) if err != nil { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/registry/rbac/clusterrole/registry.go b/pkg/registry/rbac/clusterrole/registry.go index 25d823b0db3..62a43e705a4 100644 --- a/pkg/registry/rbac/clusterrole/registry.go +++ b/pkg/registry/rbac/clusterrole/registry.go @@ -19,6 +19,7 @@ package clusterrole import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/watch" ) @@ -28,7 +29,7 @@ type Registry interface { ListClusterRoles(ctx api.Context, options *api.ListOptions) (*rbac.ClusterRoleList, error) CreateClusterRole(ctx api.Context, clusterRole *rbac.ClusterRole) error UpdateClusterRole(ctx api.Context, clusterRole *rbac.ClusterRole) error - GetClusterRole(ctx api.Context, name string) (*rbac.ClusterRole, error) + GetClusterRole(ctx api.Context, name string, options *metav1.GetOptions) (*rbac.ClusterRole, error) DeleteClusterRole(ctx api.Context, name string) error WatchClusterRoles(ctx api.Context, options *api.ListOptions) (watch.Interface, error) } @@ -67,8 +68,8 @@ func (s *storage) WatchClusterRoles(ctx api.Context, options *api.ListOptions) ( return s.Watch(ctx, options) } -func (s *storage) GetClusterRole(ctx api.Context, name string) (*rbac.ClusterRole, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetClusterRole(ctx api.Context, name string, options *metav1.GetOptions) (*rbac.ClusterRole, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } @@ -86,5 +87,5 @@ type AuthorizerAdapter struct { } func (a AuthorizerAdapter) GetClusterRole(name string) (*rbac.ClusterRole, error) { - return a.Registry.GetClusterRole(api.NewContext(), name) + return a.Registry.GetClusterRole(api.NewContext(), name, &metav1.GetOptions{}) } diff --git a/pkg/registry/rbac/clusterrolebinding/registry.go b/pkg/registry/rbac/clusterrolebinding/registry.go index a79ff5dfc73..09e08c02df1 100644 --- a/pkg/registry/rbac/clusterrolebinding/registry.go +++ b/pkg/registry/rbac/clusterrolebinding/registry.go @@ -19,6 +19,7 @@ package clusterrolebinding import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/watch" ) @@ -28,7 +29,7 @@ type Registry interface { ListClusterRoleBindings(ctx api.Context, options *api.ListOptions) (*rbac.ClusterRoleBindingList, error) CreateClusterRoleBinding(ctx api.Context, clusterRoleBinding *rbac.ClusterRoleBinding) error UpdateClusterRoleBinding(ctx api.Context, clusterRoleBinding *rbac.ClusterRoleBinding) error - GetClusterRoleBinding(ctx api.Context, name string) (*rbac.ClusterRoleBinding, error) + GetClusterRoleBinding(ctx api.Context, name string, options *metav1.GetOptions) (*rbac.ClusterRoleBinding, error) DeleteClusterRoleBinding(ctx api.Context, name string) error WatchClusterRoleBindings(ctx api.Context, options *api.ListOptions) (watch.Interface, error) } @@ -67,8 +68,8 @@ func (s *storage) WatchClusterRoleBindings(ctx api.Context, options *api.ListOpt return s.Watch(ctx, options) } -func (s *storage) GetClusterRoleBinding(ctx api.Context, name string) (*rbac.ClusterRoleBinding, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetClusterRoleBinding(ctx api.Context, name string, options *metav1.GetOptions) (*rbac.ClusterRoleBinding, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/registry/rbac/role/registry.go b/pkg/registry/rbac/role/registry.go index f2816a3f5d6..f6ece79a245 100644 --- a/pkg/registry/rbac/role/registry.go +++ b/pkg/registry/rbac/role/registry.go @@ -19,6 +19,7 @@ package role import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/watch" ) @@ -28,7 +29,7 @@ type Registry interface { ListRoles(ctx api.Context, options *api.ListOptions) (*rbac.RoleList, error) CreateRole(ctx api.Context, role *rbac.Role) error UpdateRole(ctx api.Context, role *rbac.Role) error - GetRole(ctx api.Context, name string) (*rbac.Role, error) + GetRole(ctx api.Context, name string, options *metav1.GetOptions) (*rbac.Role, error) DeleteRole(ctx api.Context, name string) error WatchRoles(ctx api.Context, options *api.ListOptions) (watch.Interface, error) } @@ -67,8 +68,8 @@ func (s *storage) WatchRoles(ctx api.Context, options *api.ListOptions) (watch.I return s.Watch(ctx, options) } -func (s *storage) GetRole(ctx api.Context, name string) (*rbac.Role, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetRole(ctx api.Context, name string, options *metav1.GetOptions) (*rbac.Role, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } @@ -86,5 +87,5 @@ type AuthorizerAdapter struct { } func (a AuthorizerAdapter) GetRole(namespace, name string) (*rbac.Role, error) { - return a.Registry.GetRole(api.WithNamespace(api.NewContext(), namespace), name) + return a.Registry.GetRole(api.WithNamespace(api.NewContext(), namespace), name, &metav1.GetOptions{}) } diff --git a/pkg/registry/rbac/rolebinding/registry.go b/pkg/registry/rbac/rolebinding/registry.go index 8a56981625b..d5e065331eb 100644 --- a/pkg/registry/rbac/rolebinding/registry.go +++ b/pkg/registry/rbac/rolebinding/registry.go @@ -19,6 +19,7 @@ package rolebinding import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/watch" ) @@ -28,7 +29,7 @@ type Registry interface { ListRoleBindings(ctx api.Context, options *api.ListOptions) (*rbac.RoleBindingList, error) CreateRoleBinding(ctx api.Context, roleBinding *rbac.RoleBinding) error UpdateRoleBinding(ctx api.Context, roleBinding *rbac.RoleBinding) error - GetRoleBinding(ctx api.Context, name string) (*rbac.RoleBinding, error) + GetRoleBinding(ctx api.Context, name string, options *metav1.GetOptions) (*rbac.RoleBinding, error) DeleteRoleBinding(ctx api.Context, name string) error WatchRoleBindings(ctx api.Context, options *api.ListOptions) (watch.Interface, error) } @@ -68,8 +69,8 @@ func (s *storage) WatchRoleBindings(ctx api.Context, options *api.ListOptions) ( return s.Watch(ctx, options) } -func (s *storage) GetRoleBinding(ctx api.Context, name string) (*rbac.RoleBinding, error) { - obj, err := s.Get(ctx, name) +func (s *storage) GetRoleBinding(ctx api.Context, name string, options *metav1.GetOptions) (*rbac.RoleBinding, error) { + obj, err := s.Get(ctx, name, options) if err != nil { return nil, err } diff --git a/pkg/registry/registrytest/endpoint.go b/pkg/registry/registrytest/endpoint.go index 12a7e9d1c49..90f16449576 100644 --- a/pkg/registry/registrytest/endpoint.go +++ b/pkg/registry/registrytest/endpoint.go @@ -22,6 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -42,7 +43,7 @@ func (e *EndpointRegistry) ListEndpoints(ctx api.Context, options *api.ListOptio return e.Endpoints, e.Err } -func (e *EndpointRegistry) GetEndpoints(ctx api.Context, name string) (*api.Endpoints, error) { +func (e *EndpointRegistry) GetEndpoints(ctx api.Context, name string, options *metav1.GetOptions) (*api.Endpoints, error) { // TODO: support namespaces in this mock e.lock.Lock() defer e.lock.Unlock() diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index d733f0bbb39..07b703f4f5f 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -26,6 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api/rest/resttest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -180,7 +181,7 @@ func (t *Tester) getObject(ctx api.Context, obj runtime.Object) (runtime.Object, return nil, err } - result, err := t.storage.Get(ctx, accessor.GetName()) + result, err := t.storage.Get(ctx, accessor.GetName(), &metav1.GetOptions{}) if err != nil { return nil, err } diff --git a/pkg/registry/registrytest/node.go b/pkg/registry/registrytest/node.go index a2cf6359b08..c5bbb7b58cc 100644 --- a/pkg/registry/registrytest/node.go +++ b/pkg/registry/registrytest/node.go @@ -21,6 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -83,7 +84,7 @@ func (r *NodeRegistry) UpdateNode(ctx api.Context, node *api.Node) error { return r.Err } -func (r *NodeRegistry) GetNode(ctx api.Context, nodeID string) (*api.Node, error) { +func (r *NodeRegistry) GetNode(ctx api.Context, nodeID string, options *metav1.GetOptions) (*api.Node, error) { r.Lock() defer r.Unlock() if r.Err != nil { diff --git a/pkg/registry/registrytest/service.go b/pkg/registry/registrytest/service.go index e139f1fb76c..7f563ae5389 100644 --- a/pkg/registry/registrytest/service.go +++ b/pkg/registry/registrytest/service.go @@ -85,7 +85,7 @@ func (r *ServiceRegistry) CreateService(ctx api.Context, svc *api.Service) (*api return svc, r.Err } -func (r *ServiceRegistry) GetService(ctx api.Context, id string) (*api.Service, error) { +func (r *ServiceRegistry) GetService(ctx api.Context, id string, options *metav1.GetOptions) (*api.Service, error) { r.mu.Lock() defer r.mu.Unlock() From 61d9fd6afc010d76ae9d86010897adf474295c50 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 5 Dec 2016 14:15:52 +0100 Subject: [PATCH 2/3] Register GetOptions in all api groups --- pkg/api/serialization_test.go | 1 + pkg/api/v1/register.go | 1 + pkg/apis/apps/v1beta1/register.go | 1 + pkg/apis/authentication/register.go | 1 + pkg/apis/authentication/v1beta1/register.go | 1 + pkg/apis/authorization/v1beta1/register.go | 1 + pkg/apis/autoscaling/v1/register.go | 1 + pkg/apis/batch/v1/register.go | 1 + pkg/apis/certificates/v1alpha1/register.go | 1 + pkg/apis/extensions/register.go | 1 + pkg/apis/extensions/v1beta1/register.go | 1 + pkg/apis/imagepolicy/register.go | 1 + pkg/apis/imagepolicy/v1alpha1/register.go | 1 + pkg/apis/policy/v1alpha1/register.go | 1 + pkg/apis/policy/v1beta1/register.go | 1 + pkg/apis/rbac/register.go | 1 + pkg/apis/rbac/v1alpha1/register.go | 1 + pkg/apis/storage/register.go | 1 + pkg/apis/storage/v1beta1/register.go | 1 + 19 files changed, 19 insertions(+) diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index 6f002645b73..5916e057783 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -238,6 +238,7 @@ func TestList(t *testing.T) { var nonRoundTrippableTypes = sets.NewString( "ExportOptions", + "GetOptions", // WatchEvent does not include kind and version and can only be deserialized // implicitly (if the caller expects the specific object). The watch call defines // the schema by content type, rather than via kind/version included in each diff --git a/pkg/api/v1/register.go b/pkg/api/v1/register.go index 73bf1371f47..15016d1283b 100644 --- a/pkg/api/v1/register.go +++ b/pkg/api/v1/register.go @@ -77,6 +77,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &PersistentVolumeClaimList{}, &DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &ListOptions{}, &PodAttachOptions{}, &PodLogOptions{}, diff --git a/pkg/apis/apps/v1beta1/register.go b/pkg/apis/apps/v1beta1/register.go index 81b8a383288..484b12bfda3 100644 --- a/pkg/apis/apps/v1beta1/register.go +++ b/pkg/apis/apps/v1beta1/register.go @@ -48,6 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/authentication/register.go b/pkg/apis/authentication/register.go index de7949eb132..bd02b2c6d6c 100644 --- a/pkg/apis/authentication/register.go +++ b/pkg/apis/authentication/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &TokenReview{}, ) diff --git a/pkg/apis/authentication/v1beta1/register.go b/pkg/apis/authentication/v1beta1/register.go index b61149dfea8..64b658042b9 100644 --- a/pkg/apis/authentication/v1beta1/register.go +++ b/pkg/apis/authentication/v1beta1/register.go @@ -45,6 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &TokenReview{}, ) diff --git a/pkg/apis/authorization/v1beta1/register.go b/pkg/apis/authorization/v1beta1/register.go index 33ac83c4f99..9b0df332008 100644 --- a/pkg/apis/authorization/v1beta1/register.go +++ b/pkg/apis/authorization/v1beta1/register.go @@ -46,6 +46,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &SelfSubjectAccessReview{}, &SubjectAccessReview{}, diff --git a/pkg/apis/autoscaling/v1/register.go b/pkg/apis/autoscaling/v1/register.go index 1eee20f39cf..8e3f7b0dab6 100644 --- a/pkg/apis/autoscaling/v1/register.go +++ b/pkg/apis/autoscaling/v1/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/batch/v1/register.go b/pkg/apis/batch/v1/register.go index 5af162b46db..67472d83e9c 100644 --- a/pkg/apis/batch/v1/register.go +++ b/pkg/apis/batch/v1/register.go @@ -48,6 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/certificates/v1alpha1/register.go b/pkg/apis/certificates/v1alpha1/register.go index 04798dd6fb3..7d51e0a5eb7 100644 --- a/pkg/apis/certificates/v1alpha1/register.go +++ b/pkg/apis/certificates/v1alpha1/register.go @@ -53,6 +53,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) // Add the watch version that applies diff --git a/pkg/apis/extensions/register.go b/pkg/apis/extensions/register.go index e29ad885a50..f92937a4d29 100644 --- a/pkg/apis/extensions/register.go +++ b/pkg/apis/extensions/register.go @@ -73,6 +73,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ReplicaSet{}, &ReplicaSetList{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &PodSecurityPolicy{}, &PodSecurityPolicyList{}, &NetworkPolicy{}, diff --git a/pkg/apis/extensions/v1beta1/register.go b/pkg/apis/extensions/v1beta1/register.go index 1f0886fbaf8..a9372a6e130 100644 --- a/pkg/apis/extensions/v1beta1/register.go +++ b/pkg/apis/extensions/v1beta1/register.go @@ -63,6 +63,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &ReplicaSet{}, &ReplicaSetList{}, &PodSecurityPolicy{}, diff --git a/pkg/apis/imagepolicy/register.go b/pkg/apis/imagepolicy/register.go index aa469b913f5..6567e32cc63 100644 --- a/pkg/apis/imagepolicy/register.go +++ b/pkg/apis/imagepolicy/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &ImageReview{}, ) diff --git a/pkg/apis/imagepolicy/v1alpha1/register.go b/pkg/apis/imagepolicy/v1alpha1/register.go index 817402ccb6d..9122ce5c409 100644 --- a/pkg/apis/imagepolicy/v1alpha1/register.go +++ b/pkg/apis/imagepolicy/v1alpha1/register.go @@ -45,6 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &ImageReview{}, ) diff --git a/pkg/apis/policy/v1alpha1/register.go b/pkg/apis/policy/v1alpha1/register.go index 25d1462bdb4..79a71437de2 100644 --- a/pkg/apis/policy/v1alpha1/register.go +++ b/pkg/apis/policy/v1alpha1/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/pkg/apis/policy/v1beta1/register.go b/pkg/apis/policy/v1beta1/register.go index f36029170aa..48f20d938f6 100644 --- a/pkg/apis/policy/v1beta1/register.go +++ b/pkg/apis/policy/v1beta1/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/pkg/apis/rbac/register.go b/pkg/apis/rbac/register.go index 8f962c9cda9..20fe77c8ecc 100644 --- a/pkg/apis/rbac/register.go +++ b/pkg/apis/rbac/register.go @@ -60,6 +60,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) versioned.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/rbac/v1alpha1/register.go b/pkg/apis/rbac/v1alpha1/register.go index f2cd91d8c5d..c6b07a65afb 100644 --- a/pkg/apis/rbac/v1alpha1/register.go +++ b/pkg/apis/rbac/v1alpha1/register.go @@ -55,6 +55,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) versioned.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/storage/register.go b/pkg/apis/storage/register.go index 6e5375d2faf..26207ec2d9f 100644 --- a/pkg/apis/storage/register.go +++ b/pkg/apis/storage/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &StorageClass{}, &StorageClassList{}, diff --git a/pkg/apis/storage/v1beta1/register.go b/pkg/apis/storage/v1beta1/register.go index 59717557c5d..962394fa5fe 100644 --- a/pkg/apis/storage/v1beta1/register.go +++ b/pkg/apis/storage/v1beta1/register.go @@ -46,6 +46,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &StorageClass{}, &StorageClassList{}, From c8711f29a50a268c6639047e0c7bffdd0c21770f Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 5 Dec 2016 16:35:00 +0100 Subject: [PATCH 3/3] Update autogenerated files --- federation/registry/cluster/BUILD | 1 + pkg/controller/serviceaccount/BUILD | 1 + pkg/registry/apps/petset/etcd/BUILD | 1 + pkg/registry/autoscaling/horizontalpodautoscaler/etcd/BUILD | 1 + pkg/registry/batch/cronjob/etcd/BUILD | 1 + pkg/registry/batch/job/etcd/BUILD | 1 + pkg/registry/certificates/certificates/BUILD | 1 + pkg/registry/core/componentstatus/BUILD | 2 ++ pkg/registry/core/configmap/BUILD | 1 + pkg/registry/core/controller/BUILD | 1 + pkg/registry/core/controller/etcd/BUILD | 2 ++ pkg/registry/core/endpoint/BUILD | 1 + pkg/registry/core/namespace/BUILD | 1 + pkg/registry/core/node/BUILD | 1 + pkg/registry/core/node/etcd/BUILD | 1 + pkg/registry/core/persistentvolume/etcd/BUILD | 2 ++ pkg/registry/core/persistentvolumeclaim/etcd/BUILD | 2 ++ pkg/registry/core/pod/BUILD | 2 ++ pkg/registry/core/pod/etcd/BUILD | 1 + pkg/registry/core/resourcequota/etcd/BUILD | 2 ++ pkg/registry/core/secret/BUILD | 1 + pkg/registry/core/service/BUILD | 1 + pkg/registry/core/service/etcd/BUILD | 1 + pkg/registry/core/serviceaccount/BUILD | 1 + pkg/registry/extensions/daemonset/etcd/BUILD | 1 + pkg/registry/extensions/ingress/etcd/BUILD | 1 + pkg/registry/extensions/replicaset/BUILD | 1 + pkg/registry/extensions/replicaset/etcd/BUILD | 1 + pkg/registry/policy/poddisruptionbudget/etcd/BUILD | 1 + pkg/registry/rbac/clusterrole/BUILD | 1 + pkg/registry/rbac/clusterrolebinding/BUILD | 1 + pkg/registry/rbac/role/BUILD | 1 + pkg/registry/rbac/rolebinding/BUILD | 1 + 33 files changed, 39 insertions(+) diff --git a/federation/registry/cluster/BUILD b/federation/registry/cluster/BUILD index ef7dda30364..46866e95246 100644 --- a/federation/registry/cluster/BUILD +++ b/federation/registry/cluster/BUILD @@ -22,6 +22,7 @@ go_library( "//federation/apis/federation/validation:go_default_library", "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/controller/serviceaccount/BUILD b/pkg/controller/serviceaccount/BUILD index f743f300836..4c53c407491 100644 --- a/pkg/controller/serviceaccount/BUILD +++ b/pkg/controller/serviceaccount/BUILD @@ -24,6 +24,7 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/retry:go_default_library", diff --git a/pkg/registry/apps/petset/etcd/BUILD b/pkg/registry/apps/petset/etcd/BUILD index dae8c17d481..54df862b43d 100644 --- a/pkg/registry/apps/petset/etcd/BUILD +++ b/pkg/registry/apps/petset/etcd/BUILD @@ -18,6 +18,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/apps:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/apps/petset:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/BUILD index d8e67e4a2b1..453e0e3b69b 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/BUILD +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/BUILD @@ -18,6 +18,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/autoscaling:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/batch/cronjob/etcd/BUILD b/pkg/registry/batch/cronjob/etcd/BUILD index 8d68b0d1a8f..39555fe3ec3 100644 --- a/pkg/registry/batch/cronjob/etcd/BUILD +++ b/pkg/registry/batch/cronjob/etcd/BUILD @@ -18,6 +18,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/batch/cronjob:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/batch/job/etcd/BUILD b/pkg/registry/batch/job/etcd/BUILD index 02c71d3342c..ec202419543 100644 --- a/pkg/registry/batch/job/etcd/BUILD +++ b/pkg/registry/batch/job/etcd/BUILD @@ -18,6 +18,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/batch/job:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/certificates/certificates/BUILD b/pkg/registry/certificates/certificates/BUILD index 5bfb8b46348..1a1caf5b1c7 100644 --- a/pkg/registry/certificates/certificates/BUILD +++ b/pkg/registry/certificates/certificates/BUILD @@ -23,6 +23,7 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/componentstatus/BUILD b/pkg/registry/core/componentstatus/BUILD index 458a21ddb24..c2253167a4c 100644 --- a/pkg/registry/core/componentstatus/BUILD +++ b/pkg/registry/core/componentstatus/BUILD @@ -19,6 +19,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apiserver:go_default_library", "//pkg/probe:go_default_library", "//pkg/probe/http:go_default_library", @@ -33,6 +34,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apiserver:go_default_library", "//pkg/probe:go_default_library", "//pkg/util/diff:go_default_library", diff --git a/pkg/registry/core/configmap/BUILD b/pkg/registry/core/configmap/BUILD index 2f2bfa2cbd8..22f758248a7 100644 --- a/pkg/registry/core/configmap/BUILD +++ b/pkg/registry/core/configmap/BUILD @@ -22,6 +22,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/controller/BUILD b/pkg/registry/core/controller/BUILD index 2f2bfa2cbd8..22f758248a7 100644 --- a/pkg/registry/core/controller/BUILD +++ b/pkg/registry/core/controller/BUILD @@ -22,6 +22,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/controller/etcd/BUILD b/pkg/registry/core/controller/etcd/BUILD index 930e8692f92..60ecbf24207 100644 --- a/pkg/registry/core/controller/etcd/BUILD +++ b/pkg/registry/core/controller/etcd/BUILD @@ -20,6 +20,7 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/controller:go_default_library", @@ -40,6 +41,7 @@ go_test( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/autoscaling:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/endpoint/BUILD b/pkg/registry/core/endpoint/BUILD index fee4214de07..af6a31ca8a2 100644 --- a/pkg/registry/core/endpoint/BUILD +++ b/pkg/registry/core/endpoint/BUILD @@ -23,6 +23,7 @@ go_library( "//pkg/api/endpoints:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/namespace/BUILD b/pkg/registry/core/namespace/BUILD index e26ccbe096b..394637044c0 100644 --- a/pkg/registry/core/namespace/BUILD +++ b/pkg/registry/core/namespace/BUILD @@ -22,6 +22,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/node/BUILD b/pkg/registry/core/node/BUILD index 7fb2a77f90f..80d40866919 100644 --- a/pkg/registry/core/node/BUILD +++ b/pkg/registry/core/node/BUILD @@ -23,6 +23,7 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/registry/core/node/etcd/BUILD b/pkg/registry/core/node/etcd/BUILD index da64c2a115d..42dff056bb5 100644 --- a/pkg/registry/core/node/etcd/BUILD +++ b/pkg/registry/core/node/etcd/BUILD @@ -18,6 +18,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/node:go_default_library", diff --git a/pkg/registry/core/persistentvolume/etcd/BUILD b/pkg/registry/core/persistentvolume/etcd/BUILD index 7c91b943e47..8e40ecb8129 100644 --- a/pkg/registry/core/persistentvolume/etcd/BUILD +++ b/pkg/registry/core/persistentvolume/etcd/BUILD @@ -17,6 +17,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/persistentvolume:go_default_library", "//pkg/registry/generic:go_default_library", @@ -35,6 +36,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/persistentvolumeclaim/etcd/BUILD b/pkg/registry/core/persistentvolumeclaim/etcd/BUILD index 0482a823d9f..75c274ca866 100644 --- a/pkg/registry/core/persistentvolumeclaim/etcd/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/etcd/BUILD @@ -17,6 +17,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/persistentvolumeclaim:go_default_library", "//pkg/registry/generic:go_default_library", @@ -35,6 +36,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/pod/BUILD b/pkg/registry/core/pod/BUILD index 4a492fd0962..97bd0adb9d8 100644 --- a/pkg/registry/core/pod/BUILD +++ b/pkg/registry/core/pod/BUILD @@ -21,6 +21,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/labels:go_default_library", @@ -43,6 +44,7 @@ go_test( "//pkg/api/errors:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/registry/core/pod/etcd/BUILD b/pkg/registry/core/pod/etcd/BUILD index f2a1a8764df..9f1b8fd23d1 100644 --- a/pkg/registry/core/pod/etcd/BUILD +++ b/pkg/registry/core/pod/etcd/BUILD @@ -50,6 +50,7 @@ go_test( "//pkg/api/errors:go_default_library", "//pkg/api/errors/storage:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/resourcequota/etcd/BUILD b/pkg/registry/core/resourcequota/etcd/BUILD index 00115e501a9..e268bbd327c 100644 --- a/pkg/registry/core/resourcequota/etcd/BUILD +++ b/pkg/registry/core/resourcequota/etcd/BUILD @@ -17,6 +17,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/resourcequota:go_default_library", "//pkg/registry/generic:go_default_library", @@ -35,6 +36,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/secret/BUILD b/pkg/registry/core/secret/BUILD index 5065fbd3852..4ded20fae4e 100644 --- a/pkg/registry/core/secret/BUILD +++ b/pkg/registry/core/secret/BUILD @@ -23,6 +23,7 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/service/BUILD b/pkg/registry/core/service/BUILD index 6cf325cc9e3..22666a26c48 100644 --- a/pkg/registry/core/service/BUILD +++ b/pkg/registry/core/service/BUILD @@ -61,6 +61,7 @@ go_test( "//pkg/api/service:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/core/service/portallocator:go_default_library", "//pkg/registry/registrytest:go_default_library", diff --git a/pkg/registry/core/service/etcd/BUILD b/pkg/registry/core/service/etcd/BUILD index 1f5814edb8f..bfe543da344 100644 --- a/pkg/registry/core/service/etcd/BUILD +++ b/pkg/registry/core/service/etcd/BUILD @@ -17,6 +17,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/service:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/serviceaccount/BUILD b/pkg/registry/core/serviceaccount/BUILD index 2f2bfa2cbd8..22f758248a7 100644 --- a/pkg/registry/core/serviceaccount/BUILD +++ b/pkg/registry/core/serviceaccount/BUILD @@ -22,6 +22,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/extensions/daemonset/etcd/BUILD b/pkg/registry/extensions/daemonset/etcd/BUILD index 6ffbf452e14..5754c1ede92 100644 --- a/pkg/registry/extensions/daemonset/etcd/BUILD +++ b/pkg/registry/extensions/daemonset/etcd/BUILD @@ -18,6 +18,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/daemonset:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/extensions/ingress/etcd/BUILD b/pkg/registry/extensions/ingress/etcd/BUILD index bafcf67cece..07ed4ac5753 100644 --- a/pkg/registry/extensions/ingress/etcd/BUILD +++ b/pkg/registry/extensions/ingress/etcd/BUILD @@ -18,6 +18,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/ingress:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/extensions/replicaset/BUILD b/pkg/registry/extensions/replicaset/BUILD index 67953f656f4..3748c8c04b7 100644 --- a/pkg/registry/extensions/replicaset/BUILD +++ b/pkg/registry/extensions/replicaset/BUILD @@ -23,6 +23,7 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/extensions/replicaset/etcd/BUILD b/pkg/registry/extensions/replicaset/etcd/BUILD index a3ccd7d13b5..8b44db3bb0f 100644 --- a/pkg/registry/extensions/replicaset/etcd/BUILD +++ b/pkg/registry/extensions/replicaset/etcd/BUILD @@ -20,6 +20,7 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/replicaset:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/policy/poddisruptionbudget/etcd/BUILD b/pkg/registry/policy/poddisruptionbudget/etcd/BUILD index f39103e3fc4..10899a35dd2 100644 --- a/pkg/registry/policy/poddisruptionbudget/etcd/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/etcd/BUILD @@ -17,6 +17,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/rbac/clusterrole/BUILD b/pkg/registry/rbac/clusterrole/BUILD index 58f54588524..1eb309d4b51 100644 --- a/pkg/registry/rbac/clusterrole/BUILD +++ b/pkg/registry/rbac/clusterrole/BUILD @@ -21,6 +21,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", diff --git a/pkg/registry/rbac/clusterrolebinding/BUILD b/pkg/registry/rbac/clusterrolebinding/BUILD index 58f54588524..1eb309d4b51 100644 --- a/pkg/registry/rbac/clusterrolebinding/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/BUILD @@ -21,6 +21,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", diff --git a/pkg/registry/rbac/role/BUILD b/pkg/registry/rbac/role/BUILD index 58f54588524..1eb309d4b51 100644 --- a/pkg/registry/rbac/role/BUILD +++ b/pkg/registry/rbac/role/BUILD @@ -21,6 +21,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", diff --git a/pkg/registry/rbac/rolebinding/BUILD b/pkg/registry/rbac/rolebinding/BUILD index 58f54588524..1eb309d4b51 100644 --- a/pkg/registry/rbac/rolebinding/BUILD +++ b/pkg/registry/rbac/rolebinding/BUILD @@ -21,6 +21,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library",