github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/6/head
k8s-merge-robot 2016-06-09 01:58:38 -07:00
parent 29c5d6c721 6fe7da72b4
commit aa008ab097
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apis/extensions/validation/validation.go
View File

@ -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 {
} }
// 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