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

fix duplicate package import in pod_worker

Browse Source
This commit is contained in:
KeZhang 2021-08-25 21:16:38 +08:00
parent 14ee98b1c0
commit dd4fd54427
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/pod_workers.go
View File

@ -33,7 +33,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/pkg/kubelet/eviction" "k8s.io/kubernetes/pkg/kubelet/eviction"
"k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/kubernetes/pkg/kubelet/metrics"
kubelettypes "k8s.io/kubernetes/pkg/kubelet/types"
kubetypes "k8s.io/kubernetes/pkg/kubelet/types" kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/kubelet/util/queue" "k8s.io/kubernetes/pkg/kubelet/util/queue"
) )
@ -576,7 +575,7 @@ func (p *podWorkers) UpdatePod(options UpdatePodOptions) {
options.KillPodOptions.PodTerminationGracePeriodSecondsOverride = &gracePeriod options.KillPodOptions.PodTerminationGracePeriodSecondsOverride = &gracePeriod
// if a static pod comes through, start tracking it explicitly (cleared by the pod worker loop) // if a static pod comes through, start tracking it explicitly (cleared by the pod worker loop)
if kubelettypes.IsStaticPod(pod) { if kubetypes.IsStaticPod(pod) {
p.terminatingStaticPodFullnames[kubecontainer.GetPodFullName(pod)] = struct{}{} p.terminatingStaticPodFullnames[kubecontainer.GetPodFullName(pod)] = struct{}{}
} }