Merge pull request #56874 from caesarxuchao/fail-open-doc

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update the comments on webhook failure policy ref: kubernetes/features#492 Note that comments on constants aren't reflected in the user docs

Merge pull request #56874 from caesarxuchao/fail-open-doc
2e3cb715 · Kubernetes Submit Queue · GitHub · 617c87ba · f02c8de7 · 2e3cb715
Unverified Commit 2e3cb715 authored Jan 25, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

types.go pkg/apis/admissionregistration/types.go +2 -4

types.go ...ing/src/k8s.io/api/admissionregistration/v1beta1/types.go +2 -4

No files found.
--- a/pkg/apis/admissionregistration/types.go
+++ b/pkg/apis/admissionregistration/types.go
@@ -106,11 +106,9 @@ type Rule struct {
 type FailurePolicyType string

 const (
-	// Ignore means the initializer is removed from the initializers list of an
-	// object if the initializer is timed out.
+	// Ignore means that an error calling the webhook is ignored.
 	Ignore FailurePolicyType = "Ignore"
-	// For 1.7, only "Ignore" is allowed. "Fail" will be allowed when the
-	// extensible admission feature is beta.
+	// Fail means that an error calling the webhook causes the admission to fail.
 	Fail FailurePolicyType = "Fail"
 )


--- a/staging/src/k8s.io/api/admissionregistration/v1beta1/types.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1beta1/types.go
@@ -54,11 +54,9 @@ type Rule struct {
 type FailurePolicyType string

 const (
-	// Ignore means the initializer is removed from the initializers list of an
-	// object if the initializer is timed out.
+	// Ignore means that an error calling the webhook is ignored.
 	Ignore FailurePolicyType = "Ignore"
-	// For 1.7, only "Ignore" is allowed. "Fail" will be allowed when the
-	// extensible admission feature is beta.
+	// Fail means that an error calling the webhook causes the admission to fail.
 	Fail FailurePolicyType = "Fail"
 )