8000 Merge pull request #123560 from ivelichkovich/master · kubernetes/kubernetes@6cc77a5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6cc77a5

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #123560 from ivelichkovich/master
kep-3716 GA, remove feature gate
2 parents a6b8069 + a51a5b4 commit 6cc77a5

File tree

18 files changed

+15
-733
lines changed

18 files changed

+15
-733
lines changed

‎api/openapi-spec/swagger.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/openapi-spec/v3/apis__admissionregistration.k8s.io__v1_openapi.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"type": "string"
4848
},
4949
"matchConditions": {
50-
"description": "MatchConditions is a list of conditions that must be met for a request to be sent to this webhook. Match conditions filter requests that have already been matched by the rules, namespaceSelector, and objectSelector. An empty list of matchConditions matches all requests. There are a maximum of 64 match conditions allowed.\n\nThe exact matching logic is (in order):\n 1. If ANY matchCondition evaluates to FALSE, the webhook is skipped.\n 2. If ALL matchConditions evaluate to TRUE, the webhook is called.\n 3. If any matchCondition evaluates to an error (but none are FALSE):\n - If failurePolicy=Fail, reject the request\n - If failurePolicy=Ignore, the error is ignored and the webhook is skipped\n\nThis is a beta feature and managed by the AdmissionWebhookMatchConditions feature gate.",
50+
"description": "MatchConditions is a list of conditions that must be met for a request to be sent to this webhook. Match conditions filter requests that have already been matched by the rules, namespaceSelector, and objectSelector. An empty list of matchConditions matches all requests. There are a maximum of 64 match conditions allowed.\n\nThe exact matching logic is (in order):\n 1. If ANY matchCondition evaluates to FALSE, the webhook is skipped.\n 2. If ALL matchConditions evaluate to TRUE, the webhook is called.\n 3. If any matchCondition evaluates to an error (but none are FALSE):\n - If failurePolicy=Fail, reject the request\n - If failurePolicy=Ignore, the error is ignored and the webhook is skipped",
5151
"items": {
5252
"allOf": [
5353
{
@@ -318,7 +318,7 @@
318318
"type": "string"
319319
},
320320
"matchConditions": {
321-
"description": "MatchConditions is a list of conditions that must be met for a request to be sent to this webhook. Match conditions filter requests that have already been matched by the rules, namespaceSelector, and objectSelector. An empty list of matchConditions matches all requests. There are a maximum of 64 match conditions allowed.\n\nThe exact matching logic is (in order):\n 1. If ANY matchCondition evaluates to FALSE, the webhook is skipped.\n 2. If ALL matchConditions evaluate to TRUE, the webhook is called.\n 3. If any matchCondition evaluates to an error (but none are FALSE):\n - If failurePolicy=Fail, reject the request\n - If failurePolicy=Ignore, the error is ignored and the webhook is skipped\n\nThis is a beta feature and managed by the AdmissionWebhookMatchConditions feature gate.",
321+
"description": "MatchConditions is a list of conditions that must be met for a request to be sent to this webhook. Match conditions filter requests that have already been matched by the rules, namespaceSelector, and objectSelector. An empty list of matchConditions matches all requests. There are a maximum of 64 match conditions allowed.\n\nThe exact matching logic is (in order):\n 1. If ANY matchCondition evaluates to FALSE, the webhook is skipped.\n 2. If ALL matchConditions evaluate to TRUE, the webhook is called.\n 3. If any matchCondition evaluates to an error (but none are FALSE):\n - If failurePolicy=Fail, reject the request\n - If failurePolicy=Ignore, the error is ignored and the webhook is skipped",
322322
"items": {
323323
"allOf": [
324324
{

‎pkg/apis/admissionregistration/types.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -868,9 +868,6 @@ type ValidatingWebhook struct {
868868
// - If failurePolicy=Fail, reject the request
869869
// - If failurePolicy=Ignore, the error is ignored and the webhook is skipped
870870
//
871-
// This is a beta feature and managed by the AdmissionWebhookMatchConditions feature gate.
872-
//
873-
// +featureGate=AdmissionWebhookMatchConditions
874871
// +optional
875872
MatchConditions []MatchCondition
876873
}
@@ -1028,9 +1025,6 @@ type MutatingWebhook struct {
10281025
// - If failurePolicy=Fail, reject the request
10291026
// - If failurePolicy=Ignore, the error is ignored and the webhook is skipped
10301027
//
1031-
// This is a beta feature and managed by the AdmissionWebhookMatchConditions feature gate.
1032-
//
1033-
// +featureGate=AdmissionWebhookMatchConditions
10341028
// +optional
10351029
MatchConditions []MatchCondition
10361030
}

‎pkg/apis/admissionregistration/util.go‎

Lines changed: 0 additions & 66 deletions
This file was deleted.
3243

0 commit comments

Comments
 (0)
0