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 }