Skip to content

Commit eaa9aba

Browse files
authored
Switch NameIsDNS validation to NameIsSubdomain validation (#1400)
Switch `NameIsDNS` validation to `NameIsSubdomain` validation for `compute`, `storage` and `networking` resources.
1 parent 622647e commit eaa9aba

File tree

15 files changed

+26
-26
lines changed

15 files changed

+26
-26
lines changed

internal/apis/compute/validation/machine.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func validateMachineSpec(machineSpec *compute.MachineSpec, fldPath *field.Path)
7474
allErrs = append(allErrs, field.Required(fldPath.Child("machineClassRef"), "must specify a machine class ref"))
7575
}
7676

77-
for _, msg := range apivalidation.NameIsDNSLabel(machineSpec.MachineClassRef.Name, false) {
77+
for _, msg := range apivalidation.NameIsDNSSubdomain(machineSpec.MachineClassRef.Name, false) {
7878
allErrs = append(allErrs, field.Invalid(fldPath.Child("machineClassRef").Child("name"), machineSpec.MachineClassRef.Name, msg))
7979
}
8080

@@ -87,13 +87,13 @@ func validateMachineSpec(machineSpec *compute.MachineSpec, fldPath *field.Path)
8787
allErrs = append(allErrs, validateMachinePower(machineSpec.Power, fldPath.Child("power"))...)
8888

8989
if machineSpec.IgnitionRef != nil && machineSpec.IgnitionRef.Name != "" {
90-
for _, msg := range apivalidation.NameIsDNSLabel(machineSpec.IgnitionRef.Name, false) {
90+
for _, msg := range apivalidation.NameIsDNSSubdomain(machineSpec.IgnitionRef.Name, false) {
9191
allErrs = append(allErrs, field.Invalid(fldPath.Child("ignitionRef").Child("name"), machineSpec.IgnitionRef.Name, msg))
9292
}
9393
}
9494

9595
if machineSpec.ImagePullSecretRef != nil {
96-
for _, msg := range apivalidation.NameIsDNSLabel(machineSpec.ImagePullSecretRef.Name, false) {
96+
for _, msg := range apivalidation.NameIsDNSSubdomain(machineSpec.ImagePullSecretRef.Name, false) {
9797
allErrs = append(allErrs, field.Invalid(fldPath.Child("imagePullSecretRef").Child("name"), machineSpec.ImagePullSecretRef.Name, msg))
9898
}
9999
}

internal/apis/compute/validation/machineclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
func ValidateMachineClass(machineClass *compute.MachineClass) field.ErrorList {
1616
var allErrs field.ErrorList
1717

18-
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(machineClass, false, apivalidation.NameIsDNSLabel, field.NewPath("metadata"))...)
18+
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(machineClass, false, apivalidation.NameIsDNSSubdomain, field.NewPath("metadata"))...)
1919

2020
allErrs = append(allErrs, validateMachineClassCapabilities(machineClass.Capabilities, field.NewPath("capabilities"))...)
2121

internal/apis/core/validation/resourcequota.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
func ValidateResourceQuota(resourceQuota *core.ResourceQuota) field.ErrorList {
1515
var allErrs field.ErrorList
1616

17-
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(resourceQuota, true, apivalidation.NameIsDNSLabel, field.NewPath("metadata"))...)
17+
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(resourceQuota, true, apivalidation.NameIsDNSSubdomain, field.NewPath("metadata"))...)
1818
allErrs = append(allErrs, validateResourceQuotaSpec(&resourceQuota.Spec, field.NewPath("spec"))...)
1919

2020
return allErrs

internal/apis/ipam/validation/prefix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
func ValidatePrefix(prefix *ipam.Prefix) field.ErrorList {
2222
var allErrs field.ErrorList
2323

24-
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(prefix, true, apivalidation.NameIsDNSLabel, field.NewPath("metadata"))...)
24+
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(prefix, true, apivalidation.NameIsDNSSubdomain, field.NewPath("metadata"))...)
2525
allErrs = append(allErrs, ValidatePrefixSpec(&prefix.Spec, field.NewPath("spec"))...)
2626

2727
return allErrs

internal/apis/networking/validation/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func validatePrefixSource(src networking.PrefixSource, idx int, objectMeta *meta
6262
allErrs = append(allErrs, ValidatePrefixPrefixTemplate(ephemeral.PrefixTemplate, fldPath.Child("ephemeral"))...)
6363
if objectMeta != nil && objectMeta.Name != "" {
6464
prefixName := networking.NetworkInterfacePrefixIPAMPrefixName(objectMeta.Name, idx)
65-
for _, msg := range apivalidation.NameIsDNSLabel(prefixName, false) {
65+
for _, msg := range apivalidation.NameIsDNSSubdomain(prefixName, false) {
6666
allErrs = append(allErrs, field.Invalid(fldPath, prefixName, fmt.Sprintf("resulting prefix name %q is invalid: %s", prefixName, msg)))
6767
}
6868
}

internal/apis/networking/validation/loadbalancer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func validateLoadBalancerSpec(spec *networking.LoadBalancerSpec, lbMeta *metav1.
3636

3737
allErrs = append(allErrs, validateNetworkInterfaceIPSources(spec.IPs, spec.IPFamilies, lbMeta, fldPath.Child("ips"))...)
3838

39-
for _, msg := range apivalidation.NameIsDNSLabel(spec.NetworkRef.Name, false) {
39+
for _, msg := range apivalidation.NameIsDNSSubdomain(spec.NetworkRef.Name, false) {
4040
allErrs = append(allErrs, field.Invalid(fldPath.Child("networkRef").Child("name"), spec.NetworkRef.Name, msg))
4141
}
4242

internal/apis/networking/validation/loadbalancerrouting.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
func ValidateLoadBalancerRouting(loadBalancerRouting *networking.LoadBalancerRouting) field.ErrorList {
1515
var allErrs field.ErrorList
1616

17-
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(loadBalancerRouting, true, apivalidation.NameIsDNSLabel, field.NewPath("metadata"))...)
17+
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(loadBalancerRouting, true, apivalidation.NameIsDNSSubdomain, field.NewPath("metadata"))...)
1818
allErrs = append(allErrs, validateLoadBalancerRouting(loadBalancerRouting)...)
1919

2020
return allErrs
@@ -31,7 +31,7 @@ func validateLoadBalancerRouting(loadBalancerRouting *networking.LoadBalancerRou
3131
allErrs = append(allErrs, commonvalidation.ValidateIP(destination.IP.Family(), destination.IP, fldPath.Child("ip"))...)
3232

3333
if targetRef := destination.TargetRef; targetRef != nil {
34-
for _, msg := range apivalidation.NameIsDNSLabel(targetRef.Name, false) {
34+
for _, msg := range apivalidation.NameIsDNSSubdomain(targetRef.Name, false) {
3535
allErrs = append(allErrs, field.Invalid(fldPath.Child("targetRef", "name"), targetRef.Name, msg))
3636
}
3737
}

internal/apis/networking/validation/natgateway.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func validateNATGatewaySpec(spec *networking.NATGatewaySpec, fldPath *field.Path
2828

2929
allErrs = append(allErrs, ironcorevalidation.ValidateIPFamily(spec.IPFamily, fldPath.Child("ipFamily"))...)
3030

31-
for _, msg := range apivalidation.NameIsDNSLabel(spec.NetworkRef.Name, false) {
31+
for _, msg := range apivalidation.NameIsDNSSubdomain(spec.NetworkRef.Name, false) {
3232
allErrs = append(allErrs, field.Invalid(fldPath.Child("networkRef").Child("name"), spec.NetworkRef.Name, msg))
3333
}
3434

internal/apis/networking/validation/network.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
func ValidateNetwork(network *networking.Network) field.ErrorList {
1818
var allErrs field.ErrorList
1919

20-
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(network, true, apivalidation.NameIsDNSLabel, field.NewPath("metadata"))...)
20+
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(network, true, apivalidation.NameIsDNSSubdomain, field.NewPath("metadata"))...)
2121
allErrs = append(allErrs, validateNetworkSpec(network.Namespace, network.Name, &network.Spec, field.NewPath("spec"))...)
2222

2323
return allErrs
@@ -113,7 +113,7 @@ func validateNetworkSpec(namespace, name string, spec *networking.NetworkSpec, f
113113
func validateNetworkPeering(peering networking.NetworkPeering, fldPath *field.Path) field.ErrorList {
114114
var allErrs field.ErrorList
115115

116-
for _, msg := range apivalidation.NameIsDNSLabel(peering.Name, false) {
116+
for _, msg := range apivalidation.NameIsDNSSubdomain(peering.Name, false) {
117117
allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), peering.Name, msg))
118118
}
119119

@@ -123,7 +123,7 @@ func validateNetworkPeering(peering networking.NetworkPeering, fldPath *field.Pa
123123
allErrs = append(allErrs, field.Invalid(fldPath.Child("networkRef", "namespace"), networkRef.Namespace, msg))
124124
}
125125
}
126-
for _, msg := range apivalidation.NameIsDNSLabel(networkRef.Name, false) {
126+
for _, msg := range apivalidation.NameIsDNSSubdomain(networkRef.Name, false) {
127127
allErrs = append(allErrs, field.Invalid(fldPath.Child("networkRef", "name"), networkRef.Name, msg))
128128
}
129129

@@ -136,13 +136,13 @@ func validatePeeringClaimRef(peeringClaimRef networking.NetworkPeeringClaimRef,
136136
if len(peeringClaimRef.Name) == 0 {
137137
allErrs = append(allErrs, field.Required(fldPath.Child("name"), "name is required"))
138138
} else {
139-
for _, msg := range apivalidation.NameIsDNSLabel(peeringClaimRef.Name, false) {
139+
for _, msg := range apivalidation.NameIsDNSSubdomain(peeringClaimRef.Name, false) {
140140
allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), peeringClaimRef.Name, msg))
141141
}
142142
}
143143

144144
if peeringClaimRef.Namespace != "" {
145-
for _, msg := range apivalidation.NameIsDNSLabel(peeringClaimRef.Namespace, false) {
145+
for _, msg := range apivalidation.NameIsDNSSubdomain(peeringClaimRef.Namespace, false) {
146146
allErrs = append(allErrs, field.Invalid(fldPath.Child("namespace"), peeringClaimRef.Namespace, msg))
147147
}
148148
}

internal/apis/networking/validation/networkinterface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func ValidateNetworkInterfaceSpec(spec *networking.NetworkInterfaceSpec, nicMeta
4444
allErrs = append(allErrs, field.Required(fldPath.Child("networkRef"), "must specify a network ref"))
4545
}
4646

47-
for _, msg := range apivalidation.NameIsDNSLabel(spec.NetworkRef.Name, false) {
47+
for _, msg := range apivalidation.NameIsDNSSubdomain(spec.NetworkRef.Name, false) {
4848
allErrs = append(allErrs, field.Invalid(fldPath.Child("networkRef").Child("name"), spec.NetworkRef.Name, msg))
4949
}
5050

0 commit comments

Comments
 (0)