From 7b98a0770fe490dc078f519ad729d6f1e42b54df Mon Sep 17 00:00:00 2001 From: gy95 <1015105054@qq.com> Date: Mon, 21 Jun 2021 19:38:40 +0800 Subject: [PATCH] remove not used IsStaticPod, prevent possible panic --- pkg/kubelet/pod/mirror_client.go | 6 ------ pkg/kubelet/types/pod_update.go | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/pod/mirror_client.go b/pkg/kubelet/pod/mirror_client.go index b5f7490e59a..22ea62b1a31 100644 --- a/pkg/kubelet/pod/mirror_client.go +++ b/pkg/kubelet/pod/mirror_client.go @@ -153,12 +153,6 @@ func (mc *basicMirrorClient) getNodeUID() (types.UID, error) { return node.UID, nil } -// IsStaticPod returns true if the passed Pod is static. -func IsStaticPod(pod *v1.Pod) bool { - source, err := kubetypes.GetPodSource(pod) - return err == nil && source != kubetypes.ApiserverSource -} - func getHashFromMirrorPod(pod *v1.Pod) (string, bool) { hash, ok := pod.Annotations[kubetypes.ConfigMirrorAnnotationKey] return hash, ok diff --git a/pkg/kubelet/types/pod_update.go b/pkg/kubelet/types/pod_update.go index 9420eef1eb3..d51d3fc963a 100644 --- a/pkg/kubelet/types/pod_update.go +++ b/pkg/kubelet/types/pod_update.go @@ -142,6 +142,9 @@ func (sp SyncPodType) String() string { // IsMirrorPod returns true if the passed Pod is a Mirror Pod. func IsMirrorPod(pod *v1.Pod) bool { + if pod.Annotations == nil { + return false + } _, ok := pod.Annotations[ConfigMirrorAnnotationKey] return ok }