Commit aa008ab0 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #27094 from caseydavenport/cd-networkpolicy-validation-fix

Automatic merge from submit-queue Fix NetworkPolicy validation bug Fix bugs in NetworkPolicy resource (new in v1.3) validation. Please add this to the v1.3 milestone.
parents 29c5d6c7 6fe7da72
...@@ -699,7 +699,6 @@ func ValidateNetworkPolicySpec(spec *extensions.NetworkPolicySpec, fldPath *fiel ...@@ -699,7 +699,6 @@ func ValidateNetworkPolicySpec(spec *extensions.NetworkPolicySpec, fldPath *fiel
// TODO: Update From to be a pointer to slice as soon as auto-generation supports it. // TODO: Update From to be a pointer to slice as soon as auto-generation supports it.
for _, f := range i.From { for _, f := range i.From {
numFroms := 0 numFroms := 0
allErrs := field.ErrorList{}
if f.PodSelector != nil { if f.PodSelector != nil {
numFroms++ numFroms++
allErrs = append(allErrs, unversionedvalidation.ValidateLabelSelector(f.PodSelector, fldPath.Child("podSelector"))...) allErrs = append(allErrs, unversionedvalidation.ValidateLabelSelector(f.PodSelector, fldPath.Child("podSelector"))...)
...@@ -730,9 +729,10 @@ func ValidateNetworkPolicy(np *extensions.NetworkPolicy) field.ErrorList { ...@@ -730,9 +729,10 @@ func ValidateNetworkPolicy(np *extensions.NetworkPolicy) field.ErrorList {
} }
// ValidateNetworkPolicyUpdate tests if an update to a NetworkPolicy is valid. // ValidateNetworkPolicyUpdate tests if an update to a NetworkPolicy is valid.
func ValidateNetworkPolicyUpdate(np, oldNP *extensions.NetworkPolicy) field.ErrorList { func ValidateNetworkPolicyUpdate(update, old *extensions.NetworkPolicy) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if !reflect.DeepEqual(np, oldNP) { allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&update.ObjectMeta, &old.ObjectMeta, field.NewPath("metadata"))...)
if !reflect.DeepEqual(update.Spec, old.Spec) {
allErrs = append(allErrs, field.Forbidden(field.NewPath("spec"), "updates to networkpolicy spec are forbidden.")) allErrs = append(allErrs, field.Forbidden(field.NewPath("spec"), "updates to networkpolicy spec are forbidden."))
} }
return allErrs return allErrs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment