From 1a59bcb142139e88c646eaa86f5344245be64dd9 Mon Sep 17 00:00:00 2001 From: caozhiyuan Date: Wed, 8 Dec 2021 10:35:06 +0800 Subject: [PATCH] add validation test for RegisterWithTaints --- pkg/kubelet/apis/config/validation/validation.go | 2 +- pkg/kubelet/apis/config/validation/validation_test.go | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/apis/config/validation/validation.go b/pkg/kubelet/apis/config/validation/validation.go index e38eb028fe1..5e38bbfdd01 100644 --- a/pkg/kubelet/apis/config/validation/validation.go +++ b/pkg/kubelet/apis/config/validation/validation.go @@ -133,7 +133,7 @@ func ValidateKubeletConfiguration(kc *kubeletconfig.KubeletConfiguration) error allErrors = append(allErrors, fmt.Errorf("invalid taint: %v", nodeTaint)) } if nodeTaint.TimeAdded != nil { - allErrors = append(allErrors, fmt.Errorf("taint TimeAdded is not nil")) + allErrors = append(allErrors, fmt.Errorf("invalid configuration: taint.TimeAdded is not nil")) } } diff --git a/pkg/kubelet/apis/config/validation/validation_test.go b/pkg/kubelet/apis/config/validation/validation_test.go index 37e4d0b0c7b..12a15e925dc 100644 --- a/pkg/kubelet/apis/config/validation/validation_test.go +++ b/pkg/kubelet/apis/config/validation/validation_test.go @@ -21,6 +21,7 @@ import ( "testing" "time" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" componentbaseconfig "k8s.io/component-base/config" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" @@ -483,6 +484,15 @@ func TestValidateKubeletConfiguration(t *testing.T) { }, errMsg: "invalid configuration: memoryThrottlingFactor 1.1 must be greater than 0 and less than or equal to 1.0", }, + { + name: "invalid Taint.TimeAdded", + configure: func(conf *kubeletconfig.KubeletConfiguration) *kubeletconfig.KubeletConfiguration { + now := metav1.Now() + conf.RegisterWithTaints = []v1.Taint{{TimeAdded: &now}} + return conf + }, + errMsg: "invalid configuration: taint.TimeAdded is not nil", + }, } for _, tc := range cases {