Skip to content

Commit 8e37501

Browse files
committed
api: remove obsolete validation of deterministic claim name
When replacing the deterministic ResourceClaim name with a generated one this particular piece of the original validation was incorrectly left in place. It's not required anymore that "<pod name>-<claim name in pod spec>" is a valid ResourceClaim name.
1 parent bde9b64 commit 8e37501

File tree

2 files changed

+1
-33
lines changed

2 files changed

+1
-33
lines changed

pkg/apis/core/validation/validation.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3017,15 +3017,7 @@ func validatePodResourceClaim(podMeta *metav1.ObjectMeta, claim core.PodResource
30173017
} else if podClaimNames.Has(claim.Name) {
30183018
allErrs = append(allErrs, field.Duplicate(fldPath.Child("name"), claim.Name))
30193019
} else {
3020-
nameErrs := ValidateDNS1123Label(claim.Name, fldPath.Child("name"))
3021-
if len(nameErrs) > 0 {
3022-
allErrs = append(allErrs, nameErrs...)
3023-
} else if podMeta != nil && claim.ResourceClaimTemplateName != nil {
3024-
claimName := podMeta.Name + "-" + claim.Name
3025-
for _, detail := range ValidateResourceClaimName(claimName, false) {
3026-
allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), claimName, "final ResourceClaim name: "+detail))
3027-
}
3028-
}
3020+
allErrs = append(allErrs, ValidateDNS1123Label(claim.Name, fldPath.Child("name"))...)
30293021
podClaimNames.Insert(claim.Name)
30303022
}
30313023
if claim.ResourceClaimName != nil && claim.ResourceClaimTemplateName != nil {

pkg/apis/core/validation/validation_test.go

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25860,9 +25860,6 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
2586025860
shortPodName := &metav1.ObjectMeta{
2586125861
Name: "some-pod",
2586225862
}
25863-
brokenPodName := &metav1.ObjectMeta{
25864-
Name: ".dot.com",
25865-
}
2586625863
goodClaimTemplate := core.PodSpec{
2586725864
Containers: []core.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: "File", Resources: core.ResourceRequirements{Claims: []core.ResourceClaim{{Name: "my-claim-template"}}}}},
2586825865
RestartPolicy: core.RestartPolicyAlways,
@@ -26046,27 +26043,6 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
2604626043
t.Errorf("expected failure for %q", k)
2604726044
}
2604826045
}
26049-
26050-
t.Run("generated-claim-name", func(t *testing.T) {
26051-
for _, spec := range []*core.PodSpec{&goodClaimTemplate, &goodClaimReference} {
26052-
claimName := spec.ResourceClaims[0].Name
26053-
t.Run(claimName, func(t *testing.T) {
26054-
for _, podMeta := range []*metav1.ObjectMeta{shortPodName, brokenPodName} {
26055-
t.Run(podMeta.Name, func(t *testing.T) {
26056-
errs := ValidatePodSpec(spec, podMeta, field.NewPath("field"), PodValidationOptions{})
26057-
// Only one out of the four combinations fails.
26058-
expectError := spec == &goodClaimTemplate && podMeta == brokenPodName
26059-
if expectError && len(errs) == 0 {
26060-
t.Error("did not get the expected failure")
26061-
}
26062-
if !expectError && len(errs) > 0 {
26063-
t.Errorf("unexpected failures: %+v", errs)
26064-
}
26065-
})
26066-
}
26067-
})
26068-
}
26069-
})
2607026046
}
2607126047

2607226048
func TestValidateLoadBalancerStatus(t *testing.T) {

0 commit comments

Comments
 (0)