Skip to content

K
k3s
Commit b6312d9d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #43429 from supereagle/remove-duplicated-import

Automatic merge from submit-queue (batch tested with PRs 43429, 43416, 43312, 43141, 43421) remove duplicated import **What this PR does / why we need it**: **Which issue this PR fixes**: **Special notes for your reviewer**: **Release note**: ``` NONE ```
parents 73a3c05f 29c831aa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
pkg/controller/endpoint/endpoints_controller.go
View file @ b6312d9d
......@@ -33,7 +33,6 @@ import (
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/v1/endpoints"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
utilpod "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/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
}
if pod.Annotations != nil {
return pod.Annotations[utilpod.PodHostnameAnnotation]
return pod.Annotations[podutil.PodHostnameAnnotation]
}
return ""
}
......@@ -233,7 +232,7 @@ func getSubdomain(pod *v1.Pod) string {
return pod.Spec.Subdomain
}
if pod.Annotations != nil {
return pod.Annotations[utilpod.PodSubdomainAnnotation]
return pod.Annotations[podutil.PodSubdomainAnnotation]
}
return ""
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment