Merge pull request kubernetes#2280 from johnbelamaric/prr-required-take-2

k8s-ci-robot · web-flow · commit a4d0812015e9 · 2021-01-21T17:59:26.000-08:00
Re-enable PRR approval requirement
diff --git a/cmd/kepval/main_test.go b/cmd/kepval/main_test.go
@@ -90,10 +90,7 @@ func TestValidation(t *testing.T) {
 				t.Errorf("%v has an error: %v", filename, kep.Error)
 			}
 
-			// temporarily disable PRR enforcement per https://github.com/kubernetes/enhancements/issues/2239
-			// so setting this to something always false
-			requiredPRRApproval := len(kep.Number) < 0
-			//requiredPRRApproval := len(kep.Number) > 0 && kep.LatestMilestone >= "v1.21"
+			requiredPRRApproval := len(kep.Number) > 0 && kep.LatestMilestone >= "v1.21" && kep.Status == "implementable"
 			if !requiredPRRApproval {
 				return
 			}

Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,7 @@ func TestValidation(t *testing.T) {`
`90`	`90`	`t.Errorf("%v has an error: %v", filename, kep.Error)`
`91`	`91`	`}`
`92`	`92`
`93`		`- // temporarily disable PRR enforcement per https://github.com/kubernetes/enhancements/issues/2239`
`94`		`- // so setting this to something always false`
`95`		`- requiredPRRApproval := len(kep.Number) < 0`
`96`		`- //requiredPRRApproval := len(kep.Number) > 0 && kep.LatestMilestone >= "v1.21"`
	`93`	`+ requiredPRRApproval := len(kep.Number) > 0 && kep.LatestMilestone >= "v1.21" && kep.Status == "implementable"`
`97`	`94`	`if !requiredPRRApproval {`
`98`	`95`	`return`
`99`	`96`	`}`