Skip to content

Commit bef866f

Browse files
authored
Change Prefix and PrefixAllocation name validation (#1401)
1 parent eaa9aba commit bef866f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

internal/apis/ipam/validation/prefix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func validateOptionalRef(ref *corev1.LocalObjectReference, fldPath *field.Path)
5353
allErrs = append(allErrs, field.Required(fldPath.Child("name"), "must specify name"))
5454
}
5555

56-
for _, msg := range apivalidation.NameIsDNSLabel(ref.Name, false) {
56+
for _, msg := range apivalidation.NameIsDNSSubdomain(ref.Name, false) {
5757
allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), ref.Name, msg))
5858
}
5959
return allErrs

internal/apis/ipam/validation/prefixallocation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
func ValidatePrefixAllocation(prefixAllocation *ipam.PrefixAllocation) field.ErrorList {
1919
var allErrs field.ErrorList
2020

21-
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(prefixAllocation, true, apivalidation.NameIsDNSLabel, field.NewPath("metadata"))...)
21+
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(prefixAllocation, true, apivalidation.NameIsDNSSubdomain, field.NewPath("metadata"))...)
2222
allErrs = append(allErrs, validatePrefixAllocationSpec(&prefixAllocation.Spec, field.NewPath("spec"))...)
2323

2424
return allErrs

internal/apis/networking/validation/network.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,13 @@ func validatePeeringClaimRef(peeringClaimRef networking.NetworkPeeringClaimRef,
152152
func validatePeeringPrefix(prefix networking.PeeringPrefix, fldPath *field.Path) field.ErrorList {
153153
var allErrs field.ErrorList
154154

155-
for _, msg := range apivalidation.NameIsDNSLabel(prefix.Name, false) {
155+
for _, msg := range apivalidation.NameIsDNSSubdomain(prefix.Name, false) {
156156
allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), prefix.Name, msg))
157157
}
158158

159159
prefixRef := prefix.PrefixRef
160160
if prefixRef.Name != "" {
161-
for _, msg := range apivalidation.NameIsDNSLabel(prefixRef.Name, false) {
161+
for _, msg := range apivalidation.NameIsDNSSubdomain(prefixRef.Name, false) {
162162
allErrs = append(allErrs, field.Invalid(fldPath.Child("prefixRef", "name"), prefixRef.Name, msg))
163163
}
164164
}

0 commit comments

Comments
 (0)