github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117043 from mouuii/mouuii-dev-0401-clean

Browse Source 
remove unnecessary check
This commit is contained in:
Kubernetes Prow Robot 2023-04-14 14:24:41 -07:00 committed by GitHub
commit 403a8fdf1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/apis/networking/validation/validation.go
View File

@ -599,27 +599,24 @@ func validateIngressClassParametersReference(params *networking.IngressClassPara
return allErrs return allErrs
} }
if params.Scope != nil || params.Namespace != nil { scope := utilpointer.StringDeref(params.Scope, "")
scope := utilpointer.StringDeref(params.Scope, "")
if !supportedIngressClassParametersReferenceScopes.Has(scope) { if !supportedIngressClassParametersReferenceScopes.Has(scope) {
allErrs = append(allErrs, field.NotSupported(fldPath.Child("scope"), scope, allErrs = append(allErrs, field.NotSupported(fldPath.Child("scope"), scope,
supportedIngressClassParametersReferenceScopes.List())) supportedIngressClassParametersReferenceScopes.List()))
} else { } else {
if scope == networking.IngressClassParametersReferenceScopeNamespace {
if scope == networking.IngressClassParametersReferenceScopeNamespace { if params.Namespace == nil {
if params.Namespace == nil { allErrs = append(allErrs, field.Required(fldPath.Child("namespace"), "`parameters.scope` is set to 'Namespace'"))
allErrs = append(allErrs, field.Required(fldPath.Child("namespace"), "`parameters.scope` is set to 'Namespace'")) } else {
} else { for _, msg := range apivalidation.ValidateNamespaceName(*params.Namespace, false) {
for _, msg := range apivalidation.ValidateNamespaceName(*params.Namespace, false) { allErrs = append(allErrs, field.Invalid(fldPath.Child("namespace"), *params.Namespace, msg))
allErrs = append(allErrs, field.Invalid(fldPath.Child("namespace"), *params.Namespace, msg))
}
} }
} }
}
if scope == networking.IngressClassParametersReferenceScopeCluster && params.Namespace != nil { if scope == networking.IngressClassParametersReferenceScopeCluster && params.Namespace != nil {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("namespace"), "`parameters.scope` is set to 'Cluster'")) allErrs = append(allErrs, field.Forbidden(fldPath.Child("namespace"), "`parameters.scope` is set to 'Cluster'"))
}
} }
} }

8
pkg/apis/networking/validation/validation_test.go
View File

@ -1652,6 +1652,14 @@ func TestValidateIngressClass(t *testing.T) {
), ),
expectedErrs: field.ErrorList{}, expectedErrs: field.ErrorList{},
}, },
"valid name, valid controller, invalid scope": {
ingressClass: makeValidIngressClass("test123", "foo.co/bar",
setParams(makeIngressClassParams(nil, "foo", "bar", nil, utilpointer.String("foo_ns"))),
),
expectedErrs: field.ErrorList{
field.Required(field.NewPath("spec.parameters.scope"), ""),
},
},
"namespace not set when scope is Namespace": { "namespace not set when scope is Namespace": {
ingressClass: makeValidIngressClass("test123", "foo.co/bar", ingressClass: makeValidIngressClass("test123", "foo.co/bar",
setParams(makeIngressClassParams(nil, "foo", "bar", utilpointer.String("Namespace"), nil)), setParams(makeIngressClassParams(nil, "foo", "bar", utilpointer.String("Namespace"), nil)),