From 3301efa6a06646cfd4b7989657650af5b407ac93 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Mon, 5 Feb 2024 20:26:48 +0200 Subject: [PATCH] kubelet: warn instead of error for unsupported options on Windows Make validateKubeletOSConfiguration() show warnings instead of returning errors on Windows for the fields "CgroupsPerQOS" and "EnforceNodeAllocatable". --- .../apis/config/validation/validation_windows.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/kubelet/apis/config/validation/validation_windows.go b/pkg/kubelet/apis/config/validation/validation_windows.go index e31e1fbc643..a6f0cba34c6 100644 --- a/pkg/kubelet/apis/config/validation/validation_windows.go +++ b/pkg/kubelet/apis/config/validation/validation_windows.go @@ -20,24 +20,22 @@ limitations under the License. package validation import ( - "fmt" + "k8s.io/klog/v2" - utilerrors "k8s.io/apimachinery/pkg/util/errors" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" ) // validateKubeletOSConfiguration validates os specific kubelet configuration and returns an error if it is invalid. func validateKubeletOSConfiguration(kc *kubeletconfig.KubeletConfiguration) error { - message := "invalid configuration: %v (%v) %v is not supported on Windows" - allErrors := []error{} + message := "ignored configuration option: %v (%v) %v is not supported on Windows" if kc.CgroupsPerQOS { - allErrors = append(allErrors, fmt.Errorf(message, "CgroupsPerQOS", "--cgroups-per-qos", kc.CgroupsPerQOS)) + klog.Warningf(message, "CgroupsPerQOS", "--cgroups-per-qos", kc.CgroupsPerQOS) } if len(kc.EnforceNodeAllocatable) > 0 { - allErrors = append(allErrors, fmt.Errorf(message, "EnforceNodeAllocatable", "--enforce-node-allocatable", kc.EnforceNodeAllocatable)) + klog.Warningf(message, "EnforceNodeAllocatable", "--enforce-node-allocatable", kc.EnforceNodeAllocatable) } - return utilerrors.NewAggregate(allErrors) + return nil }