From fd819f8fdc2528249efc94c18da434b61fe87925 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Fri, 28 Jun 2019 13:58:08 +0200 Subject: [PATCH] Move APIObjectVersioner --- pkg/controller/volume/scheduling/scheduler_binder.go | 4 ++-- pkg/kubelet/util/manager/cache_based_manager.go | 6 +++--- plugin/pkg/admission/resourcequota/resource_access.go | 4 ++-- .../pkg/registry/generic/registry/storage_factory.go | 4 ++-- .../apiserver/pkg/registry/generic/registry/store_test.go | 6 +++--- .../k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go | 4 ++-- .../pkg/storage/{etcd => etcd3}/api_object_versioner.go | 2 +- .../storage/{etcd => etcd3}/api_object_versioner_test.go | 2 +- staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go | 3 +-- .../src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go | 3 +-- .../src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go | 3 +-- 11 files changed, 19 insertions(+), 22 deletions(-) rename staging/src/k8s.io/apiserver/pkg/storage/{etcd => etcd3}/api_object_versioner.go (99%) rename staging/src/k8s.io/apiserver/pkg/storage/{etcd => etcd3}/api_object_versioner_test.go (99%) diff --git a/pkg/controller/volume/scheduling/scheduler_binder.go b/pkg/controller/volume/scheduling/scheduler_binder.go index bd8c525a898..cf16292bb86 100644 --- a/pkg/controller/volume/scheduling/scheduler_binder.go +++ b/pkg/controller/volume/scheduling/scheduler_binder.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/apiserver/pkg/storage/etcd" + "k8s.io/apiserver/pkg/storage/etcd3" coreinformers "k8s.io/client-go/informers/core/v1" storageinformers "k8s.io/client-go/informers/storage/v1" clientset "k8s.io/client-go/kubernetes" @@ -425,7 +425,7 @@ func (b *volumeBinder) bindAPIUpdate(podName string, bindings []*bindingInfo, cl } var ( - versioner = etcd.APIObjectVersioner{} + versioner = etcd3.APIObjectVersioner{} ) // checkBindings runs through all the PVCs in the Pod and checks: diff --git a/pkg/kubelet/util/manager/cache_based_manager.go b/pkg/kubelet/util/manager/cache_based_manager.go index 12f2a9c04db..591a57ab868 100644 --- a/pkg/kubelet/util/manager/cache_based_manager.go +++ b/pkg/kubelet/util/manager/cache_based_manager.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/api/core/v1" - storageetcd "k8s.io/apiserver/pkg/storage/etcd" + storageetcd3 "k8s.io/apiserver/pkg/storage/etcd3" "k8s.io/kubernetes/pkg/kubelet/util" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -85,8 +85,8 @@ func isObjectOlder(newObject, oldObject runtime.Object) bool { if newObject == nil || oldObject == nil { return false } - newVersion, _ := storageetcd.Versioner.ObjectResourceVersion(newObject) - oldVersion, _ := storageetcd.Versioner.ObjectResourceVersion(oldObject) + newVersion, _ := storageetcd3.Versioner.ObjectResourceVersion(newObject) + oldVersion, _ := storageetcd3.Versioner.ObjectResourceVersion(oldObject) return newVersion < oldVersion } diff --git a/plugin/pkg/admission/resourcequota/resource_access.go b/plugin/pkg/admission/resourcequota/resource_access.go index dfdde7e753e..8ae21a80632 100644 --- a/plugin/pkg/admission/resourcequota/resource_access.go +++ b/plugin/pkg/admission/resourcequota/resource_access.go @@ -25,7 +25,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/apiserver/pkg/storage/etcd" + "k8s.io/apiserver/pkg/storage/etcd3" "k8s.io/client-go/kubernetes" corev1listers "k8s.io/client-go/listers/core/v1" ) @@ -88,7 +88,7 @@ func (e *quotaAccessor) UpdateQuotaStatus(newQuota *corev1.ResourceQuota) error return nil } -var etcdVersioner = etcd.APIObjectVersioner{} +var etcdVersioner = etcd3.APIObjectVersioner{} // checkCache compares the passed quota against the value in the look-aside cache and returns the newer // if the cache is out of date, it deletes the stale entry. This only works because of etcd resourceVersions diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/storage_factory.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/storage_factory.go index 45d6744ad9d..5a0d207cbf9 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/storage_factory.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/storage_factory.go @@ -25,7 +25,7 @@ import ( "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" cacherstorage "k8s.io/apiserver/pkg/storage/cacher" - etcdstorage "k8s.io/apiserver/pkg/storage/etcd" + "k8s.io/apiserver/pkg/storage/etcd3" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend/factory" ) @@ -55,7 +55,7 @@ func StorageWithCacher(capacity int) generic.StorageDecorator { cacherConfig := cacherstorage.Config{ CacheCapacity: capacity, Storage: s, - Versioner: etcdstorage.APIObjectVersioner{}, + Versioner: etcd3.APIObjectVersioner{}, ResourcePrefix: resourcePrefix, KeyFunc: keyFunc, NewFunc: newFunc, diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go index e8a46425e08..2bbbcdf22f7 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go @@ -49,8 +49,8 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" cacherstorage "k8s.io/apiserver/pkg/storage/cacher" - etcdstorage "k8s.io/apiserver/pkg/storage/etcd" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + "k8s.io/apiserver/pkg/storage/etcd3" "k8s.io/apiserver/pkg/storage/names" "k8s.io/apiserver/pkg/storage/storagebackend/factory" storagetesting "k8s.io/apiserver/pkg/storage/testing" @@ -249,7 +249,7 @@ func TestStoreListResourceVersion(t *testing.T) { t.Fatal(err) } - versioner := etcdstorage.APIObjectVersioner{} + versioner := etcd3.APIObjectVersioner{} rev, err := versioner.ObjectResourceVersion(obj) if err != nil { t.Fatal(err) @@ -1553,7 +1553,7 @@ func newTestGenericStoreRegistry(t *testing.T, scheme *runtime.Scheme, hasCacheE config := cacherstorage.Config{ CacheCapacity: 10, Storage: s, - Versioner: etcdstorage.APIObjectVersioner{}, + Versioner: etcd3.APIObjectVersioner{}, ResourcePrefix: podPrefix, KeyFunc: func(obj runtime.Object) (string, error) { return storage.NoNamespaceKeyFunc(podPrefix, obj) }, GetAttrsFunc: getPodAttrs, diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go index fb265ba929e..e1f30de83e2 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/storage" - "k8s.io/apiserver/pkg/storage/etcd" + "k8s.io/apiserver/pkg/storage/etcd3" "k8s.io/client-go/tools/cache" ) @@ -75,7 +75,7 @@ func newTestWatchCache(capacity int) *watchCache { } return labels.Set(pod.Labels), fields.Set{"spec.nodeName": pod.Spec.NodeName}, nil } - versioner := etcd.APIObjectVersioner{} + versioner := etcd3.APIObjectVersioner{} mockHandler := func(*watchCacheEvent) {} wc := newWatchCache(capacity, keyFunc, mockHandler, getAttrsFunc, versioner) wc.clock = clock.NewFakeClock(time.Now()) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/api_object_versioner.go similarity index 99% rename from staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/api_object_versioner.go index cfae4693972..321cab04d11 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/api_object_versioner.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcd3 import ( "strconv" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/api_object_versioner_test.go similarity index 99% rename from staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/api_object_versioner_test.go index 4126f58dd98..9f8acce24e1 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/api_object_versioner_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package etcd3 import ( "testing" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go index f2414773471..a92f27e7514 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go @@ -38,7 +38,6 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/features" "k8s.io/apiserver/pkg/storage" - "k8s.io/apiserver/pkg/storage/etcd" "k8s.io/apiserver/pkg/storage/etcd3/metrics" "k8s.io/apiserver/pkg/storage/value" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -89,7 +88,7 @@ func New(c *clientv3.Client, codec runtime.Codec, prefix string, transformer val } func newStore(c *clientv3.Client, pagingEnabled bool, codec runtime.Codec, prefix string, transformer value.Transformer) *store { - versioner := etcd.APIObjectVersioner{} + versioner := APIObjectVersioner{} result := &store{ client: c, codec: codec, diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go index 6dfcb4bc304..85aa3b3be3e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go @@ -46,7 +46,6 @@ import ( examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/features" "k8s.io/apiserver/pkg/storage" - "k8s.io/apiserver/pkg/storage/etcd" storagetesting "k8s.io/apiserver/pkg/storage/testing" "k8s.io/apiserver/pkg/storage/value" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -1281,7 +1280,7 @@ func TestListInconsistentContinuation(t *testing.T) { } // compact to latest revision. - versioner := etcd.APIObjectVersioner{} + versioner := APIObjectVersioner{} lastRVString := preset[2].storedObj.ResourceVersion lastRV, err := versioner.ParseResourceVersion(lastRVString) if err != nil { diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go index 45273a005f6..d1b90dabe3c 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go @@ -43,7 +43,6 @@ import ( "k8s.io/apiserver/pkg/features" "k8s.io/apiserver/pkg/storage" cacherstorage "k8s.io/apiserver/pkg/storage/cacher" - etcdstorage "k8s.io/apiserver/pkg/storage/etcd" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/apiserver/pkg/storage/etcd3" storagetesting "k8s.io/apiserver/pkg/storage/testing" @@ -102,7 +101,7 @@ func newEtcdTestStorage(t *testing.T, prefix string) (*etcdtesting.EtcdTestServe func newTestCacher(s storage.Interface, cap int) (*cacherstorage.Cacher, storage.Versioner) { prefix := "pods" - v := etcdstorage.APIObjectVersioner{} + v := etcd3.APIObjectVersioner{} config := cacherstorage.Config{ CacheCapacity: cap, Storage: s,