Skip to content

Commit 08c3108

Browse files
authored
Merge pull request kubernetes#106858 from cmssczy/add_RegisterWithTaints_validation_test
add kubelet config validation test for RegisterWithTaints
2 parents 08d3285 + 1a59bcb commit 08c3108

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

pkg/kubelet/apis/config/validation/validation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func ValidateKubeletConfiguration(kc *kubeletconfig.KubeletConfiguration) error
133133
allErrors = append(allErrors, fmt.Errorf("invalid taint: %v", nodeTaint))
134134
}
135135
if nodeTaint.TimeAdded != nil {
136-
allErrors = append(allErrors, fmt.Errorf("taint TimeAdded is not nil"))
136+
allErrors = append(allErrors, fmt.Errorf("invalid configuration: taint.TimeAdded is not nil"))
137137
}
138138
}
139139

pkg/kubelet/apis/config/validation/validation_test.go

+10
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"testing"
2222
"time"
2323

24+
v1 "k8s.io/api/core/v1"
2425
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2526
componentbaseconfig "k8s.io/component-base/config"
2627
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
@@ -483,6 +484,15 @@ func TestValidateKubeletConfiguration(t *testing.T) {
483484
},
484485
errMsg: "invalid configuration: memoryThrottlingFactor 1.1 must be greater than 0 and less than or equal to 1.0",
485486
},
487+
{
488+
name: "invalid Taint.TimeAdded",
489+
configure: func(conf *kubeletconfig.KubeletConfiguration) *kubeletconfig.KubeletConfiguration {
490+
now := metav1.Now()
491+
conf.RegisterWithTaints = []v1.Taint{{TimeAdded: &now}}
492+
return conf
493+
},
494+
errMsg: "invalid configuration: taint.TimeAdded is not nil",
495+
},
486496
}
487497

488498
for _, tc := range cases {

0 commit comments

Comments
 (0)