github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

remove duplicated import

Browse Source
This commit is contained in:
Cao Shufeng
2017-11-14 11:36:32 +08:00
parent 2d64ce5e8e
commit 86968e44d0
13 changed files with 41 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kubelet/app/server.go
View File

@@ -46,7 +46,6 @@ import (
"k8s.io/apiserver/pkg/server/healthz"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/apiserver/pkg/util/flag"
clientgoclientset "k8s.io/client-go/kubernetes"
clientset "k8s.io/client-go/kubernetes"
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
restclient "k8s.io/client-go/rest"
@@ -331,7 +330,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies) (err error) {
var kubeClient clientset.Interface
var eventClient v1core.EventsGetter
var heartbeatClient v1core.CoreV1Interface
var externalKubeClient clientgoclientset.Interface
var externalKubeClient clientset.Interface
clientConfig, err := CreateAPIServerClientConfig(s)
@@ -357,7 +356,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies) (err error) {
clientCertificateManager.SetCertificateSigningRequestClient(kubeClient.CertificatesV1beta1().CertificateSigningRequests())
clientCertificateManager.Start()
}
externalKubeClient, err = clientgoclientset.NewForConfig(clientConfig)
externalKubeClient, err = clientset.NewForConfig(clientConfig)
if err != nil {
glog.Warningf("New kubeClient from clientConfig error: %v", err)
}

7
cmd/kubemark/hollow-node.go
View File

@@ -22,7 +22,6 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apiserver/pkg/util/flag"
clientgoclientset "k8s.io/client-go/kubernetes"
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
@@ -103,7 +102,7 @@ func main() {
glog.Fatalf("Failed to create a ClientConfig: %v. Exiting.", err)
}
clientset, err := clientset.NewForConfig(clientConfig)
client, err := clientset.NewForConfig(clientConfig)
if err != nil {
glog.Fatalf("Failed to create a ClientSet: %v. Exiting.", err)
}
@@ -126,7 +125,7 @@ func main() {
hollowKubelet := kubemark.NewHollowKubelet(
config.NodeName,
clientset,
client,
cadvisorInterface,
fakeDockerClientConfig,
config.KubeletPort,
@@ -139,7 +138,7 @@ func main() {
}
if config.Morph == "proxy" {
client, err := clientgoclientset.NewForConfig(clientConfig)
client, err := clientset.NewForConfig(clientConfig)
if err != nil {
glog.Fatalf("Failed to create API Server client: %v", err)
}