From 61e624296719d6a3ad620b9bbbb8085240191b38 Mon Sep 17 00:00:00 2001 From: Tim Allclair Date: Thu, 7 Nov 2024 15:58:24 -0800 Subject: [PATCH] Move windows infeasible resize check into canResizePod --- pkg/kubelet/kubelet.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index dc1e7029eca..e4ab7a79dee 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -2830,6 +2830,10 @@ func isPodResizeInProgress(pod *v1.Pod, podStatus *kubecontainer.PodStatus) bool // pod should hold the desired (pre-allocated) spec. // Returns true if the resize can proceed. func (kl *Kubelet) canResizePod(pod *v1.Pod) (bool, v1.PodResizeStatus) { + if goos == "windows" { + return false, v1.PodResizeStatusInfeasible + } + if v1qos.GetPodQOS(pod) == v1.PodQOSGuaranteed && !utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScalingExclusiveCPUs) { if utilfeature.DefaultFeatureGate.Enabled(features.CPUManager) { if kl.containerManager.GetNodeConfig().CPUManagerPolicy == "static" { @@ -2891,10 +2895,6 @@ func (kl *Kubelet) handlePodResourcesResize(pod *v1.Pod, podStatus *kubecontaine // Pod allocation does not need to be updated. return allocatedPod, nil } - if goos == "windows" { - kl.statusManager.SetPodResizeStatus(pod.UID, v1.PodResizeStatusInfeasible) - return allocatedPod, nil - } kl.podResizeMutex.Lock() defer kl.podResizeMutex.Unlock()