Rebase allow updates to pdbs to latest upstream master

pkg/apis/policy/validation/validation.go

@@ -19,7 +19,6 @@ package validation
 import (
 	"fmt"
 	"path/filepath"
-	"reflect"
 	"regexp"
 	"strings"
 
@@ -43,14 +42,10 @@ func ValidatePodDisruptionBudget(pdb *policy.PodDisruptionBudget) field.ErrorLis
 }
 
 func ValidatePodDisruptionBudgetUpdate(pdb, oldPdb *policy.PodDisruptionBudget) field.ErrorList {
-	allErrs := field.ErrorList{}
-
 	restoreGeneration := pdb.Generation
 	pdb.Generation = oldPdb.Generation
 
-	if !reflect.DeepEqual(pdb.Spec, oldPdb.Spec) {
-		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec"), "updates to poddisruptionbudget spec are forbidden."))
-	}
+	allErrs := ValidatePodDisruptionBudgetSpec(pdb.Spec, field.NewPath("spec"))
 	allErrs = append(allErrs, ValidatePodDisruptionBudgetStatus(pdb.Status, field.NewPath("status"))...)
 
 	pdb.Generation = restoreGeneration

pkg/apis/policy/validation/validation_test.go

@@ -140,12 +140,10 @@ func TestValidatePodDisruptionBudgetUpdate(t *testing.T) {
 			generations: []int64{int64(2), int64(3)},
 			specs: []policy.PodDisruptionBudgetSpec{
 				{
-					MinAvailable:   &c1,
-					MaxUnavailable: &c2,
+					MinAvailable: &c1,
 				},
 				{
-					MinAvailable:   &c1,
-					MaxUnavailable: &c2,
+					MinAvailable: &c1,
 				},
 			},
 			status: []policy.PodDisruptionBudgetStatus{
@@ -163,7 +161,7 @@ func TestValidatePodDisruptionBudgetUpdate(t *testing.T) {
 			ok: true,
 		},
 		{
-			name:        "only update pdb spec",
+			name:        "update pdb spec causing clash",
 			generations: []int64{int64(2), int64(3)},
 			specs: []policy.PodDisruptionBudgetSpec{
 				{
@@ -192,7 +190,6 @@ func TestValidatePodDisruptionBudgetUpdate(t *testing.T) {
 					MaxUnavailable: &c2,
 				},
 				{
-					MinAvailable:   &c1,
 					MaxUnavailable: &c3,
 				},
 			},
@@ -208,7 +205,7 @@ func TestValidatePodDisruptionBudgetUpdate(t *testing.T) {
 					DesiredHealthy:        3,
 				},
 			},
-			ok: false,
+			ok: true,
 		},
 	}
 
@@ -219,9 +216,9 @@ func TestValidatePodDisruptionBudgetUpdate(t *testing.T) {
 
 		pdb.Spec = tc.specs[1]
 		pdb.Generation = tc.generations[1]
-		oldPdb.Status = tc.status[1]
+		pdb.Status = tc.status[1]
 
-		errs := ValidatePodDisruptionBudgetUpdate(oldPdb, pdb)
+		errs := ValidatePodDisruptionBudgetUpdate(pdb, oldPdb)
 		if tc.ok && len(errs) > 0 {
 			t.Errorf("[%d:%s] unexpected errors: %v", i, tc.name, errs)
 		} else if !tc.ok && len(errs) == 0 {