Skip to content

Commit 3cb3c6b

Browse files
committed
review fixes
1 parent 8c5c025 commit 3cb3c6b

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

internal/util/taints/validation.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package taints
1919
import (
2020
"strings"
2121

22-
"k8s.io/apimachinery/pkg/util/validation"
22+
"k8s.io/apimachinery/pkg/api/validate/content"
2323
"k8s.io/apimachinery/pkg/util/validation/field"
2424

2525
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
@@ -58,11 +58,11 @@ func ValidateMachineTaints(taints []clusterv1.MachineTaint, taintsPath *field.Pa
5858
allErrs = append(allErrs, field.Invalid(idxPath.Child("key"), taint.Key, "taint is deprecated since 1.24 and should not be used anymore"))
5959
}
6060

61-
if validation.IsQualifiedName(taint.Key) != nil {
61+
for _, msg := range content.IsLabelKey(taint.Key) {
6262
allErrs = append(allErrs, field.Invalid(
6363
idxPath.Child("key"),
6464
taint.Key,
65-
"key must be a valid qualified name of max size 63 characters with an optional subdomain prefix of max size 253 characters",
65+
msg,
6666
))
6767
}
6868
}

util/test/builder/zz_generated.deepcopy.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)