github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 17:38:50 +00:00
Code Issues Projects Releases Wiki Activity

easy changes

Browse Source
This commit is contained in:
Chao Xu
2017-04-26 17:13:48 -07:00
parent 493e4486b6
commit 3fa7b7824a
54 changed files with 191 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/bootstrap/bootstrapsigner.go
View File

@@ -30,10 +30,11 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api"
bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api"
"k8s.io/kubernetes/pkg/util/metrics"
)
@@ -291,7 +292,7 @@ func (e *BootstrapSigner) getTokens() map[string]string {
}
func copyConfigMap(orig *v1.ConfigMap) (*v1.ConfigMap, error) {
newCMObj, err := api.Scheme.DeepCopy(orig)
newCMObj, err := scheme.Scheme.DeepCopy(orig)
if err != nil {
return nil, err
}

2
pkg/controller/bootstrap/bootstrapsigner_test.go
View File

@@ -24,9 +24,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1"
core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api"
)

2
pkg/controller/bootstrap/tokencleaner.go
View File

@@ -28,9 +28,9 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/api"
bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api"
"k8s.io/kubernetes/pkg/util/metrics"
)

2
pkg/controller/bootstrap/tokencleaner_test.go
View File

@@ -24,8 +24,8 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/pkg/api"
core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
)
func init() {