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

Merge pull request #104874 from wojtek-t/migrate_clock_1

Browse Source 
Unify towards k8s.io/utils/clock - part 1
This commit is contained in:
Kubernetes Prow Robot
2021-09-13 19:09:20 -07:00
committed by GitHub
parent c79f7c1add 4ce452989b
commit 047a6b9f86
58 changed files with 154 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controlplane/instance.go
View File

@@ -55,7 +55,6 @@ import (
storageapiv1alpha1 "k8s.io/api/storage/v1alpha1"
storageapiv1beta1 "k8s.io/api/storage/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/clock"
utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
@@ -84,6 +83,7 @@ import (
"k8s.io/kubernetes/pkg/routes"
"k8s.io/kubernetes/pkg/serviceaccount"
nodeutil "k8s.io/kubernetes/pkg/util/node"
"k8s.io/utils/clock"
// RESTStorage installers
admissionregistrationrest "k8s.io/kubernetes/pkg/registry/admissionregistration/rest"