github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #109970 from stevekuznetsov/skuznets/isolate-versioner

Browse Source 
storage: move the APIObjectVersioner definition to storage
This commit is contained in:
Kubernetes Prow Robot
2022-05-12 12:32:44 -07:00
committed by GitHub
parent 6e04ca634d fa2a6d6339
commit 1be1ec4aa3
16 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/util/manager/cache_based_manager.go
View File

@@ -23,7 +23,7 @@ import (
"time"
"k8s.io/api/core/v1"
storageetcd3 "k8s.io/apiserver/pkg/storage/etcd3"
"k8s.io/apiserver/pkg/storage"
"k8s.io/kubernetes/pkg/kubelet/util"
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -87,8 +87,8 @@ func isObjectOlder(newObject, oldObject runtime.Object) bool {
if newObject == nil || oldObject == nil {
return false
}
newVersion, _ := storageetcd3.Versioner.ObjectResourceVersion(newObject)
oldVersion, _ := storageetcd3.Versioner.ObjectResourceVersion(oldObject)
newVersion, _ := storage.APIObjectVersioner{}.ObjectResourceVersion(newObject)
oldVersion, _ := storage.APIObjectVersioner{}.ObjectResourceVersion(oldObject)
return newVersion < oldVersion
}

4
pkg/scheduler/framework/plugins/volumebinding/binder.go
View File

@@ -30,7 +30,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/storage/etcd3"
"k8s.io/apiserver/pkg/storage"
utilfeature "k8s.io/apiserver/pkg/util/feature"
coreinformers "k8s.io/client-go/informers/core/v1"
storageinformers "k8s.io/client-go/informers/storage/v1"
@@ -531,7 +531,7 @@ func (b *volumeBinder) bindAPIUpdate(pod *v1.Pod, bindings []*BindingInfo, claim
}
var (
versioner = etcd3.APIObjectVersioner{}
versioner = storage.APIObjectVersioner{}
)
// checkBindings runs through all the PVCs in the Pod and checks: