From 08433067c36330f4678e38a7a013051198c47e53 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 28 Jun 2019 15:29:20 -0700 Subject: [PATCH] Change default matchPolicy to Equivalent in v1 --- pkg/apis/admissionregistration/v1/defaults.go | 4 ++-- staging/src/k8s.io/api/admissionregistration/v1/types.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/apis/admissionregistration/v1/defaults.go b/pkg/apis/admissionregistration/v1/defaults.go index b91a49eeec1..90e0af7cbf8 100644 --- a/pkg/apis/admissionregistration/v1/defaults.go +++ b/pkg/apis/admissionregistration/v1/defaults.go @@ -33,7 +33,7 @@ func SetDefaults_ValidatingWebhook(obj *admissionregistrationv1.ValidatingWebhoo obj.FailurePolicy = &policy } if obj.MatchPolicy == nil { - policy := admissionregistrationv1.Exact + policy := admissionregistrationv1.Equivalent obj.MatchPolicy = &policy } if obj.NamespaceSelector == nil { @@ -65,7 +65,7 @@ func SetDefaults_MutatingWebhook(obj *admissionregistrationv1.MutatingWebhook) { obj.FailurePolicy = &policy } if obj.MatchPolicy == nil { - policy := admissionregistrationv1.Exact + policy := admissionregistrationv1.Equivalent obj.MatchPolicy = &policy } if obj.NamespaceSelector == nil { diff --git a/staging/src/k8s.io/api/admissionregistration/v1/types.go b/staging/src/k8s.io/api/admissionregistration/v1/types.go index c122efd139d..bcee91d72c6 100644 --- a/staging/src/k8s.io/api/admissionregistration/v1/types.go +++ b/staging/src/k8s.io/api/admissionregistration/v1/types.go @@ -209,7 +209,7 @@ type ValidatingWebhook struct { // and "rules" only included `apiGroups:["apps"], apiVersions:["v1"], resources: ["deployments"]`, // a request to apps/v1beta1 or extensions/v1beta1 would be converted to apps/v1 and sent to the webhook. // - // Defaults to "Exact" + // Defaults to "Equivalent" // +optional MatchPolicy *MatchPolicyType `json:"matchPolicy,omitempty" protobuf:"bytes,9,opt,name=matchPolicy,casttype=MatchPolicyType"` @@ -341,7 +341,7 @@ type MutatingWebhook struct { // and "rules" only included `apiGroups:["apps"], apiVersions:["v1"], resources: ["deployments"]`, // a request to apps/v1beta1 or extensions/v1beta1 would be converted to apps/v1 and sent to the webhook. // - // Defaults to "Exact" + // Defaults to "Equivalent" // +optional MatchPolicy *MatchPolicyType `json:"matchPolicy,omitempty" protobuf:"bytes,9,opt,name=matchPolicy,casttype=MatchPolicyType"`