github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

remove duplicated import

Browse Source
This commit is contained in:
supereagle 2017-03-21 14:45:26 +08:00
parent 47320fd3f0
commit 29c831aabd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/endpoint/endpoints_controller.go
View File

@ -33,7 +33,6 @@ import (
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/v1/endpoints" "k8s.io/kubernetes/pkg/api/v1/endpoints"
podutil "k8s.io/kubernetes/pkg/api/v1/pod" podutil "k8s.io/kubernetes/pkg/api/v1/pod"
utilpod "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1"
corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"
@ -223,7 +222,7 @@ func getHostname(pod *v1.Pod) string {
return pod.Spec.Hostname return pod.Spec.Hostname
} }
if pod.Annotations != nil { if pod.Annotations != nil {
return pod.Annotations[utilpod.PodHostnameAnnotation] return pod.Annotations[podutil.PodHostnameAnnotation]
} }
return "" return ""
} }
@ -233,7 +232,7 @@ func getSubdomain(pod *v1.Pod) string {
return pod.Spec.Subdomain return pod.Spec.Subdomain
} }
if pod.Annotations != nil { if pod.Annotations != nil {
return pod.Annotations[utilpod.PodSubdomainAnnotation] return pod.Annotations[podutil.PodSubdomainAnnotation]
} }
return "" return ""
} }