-
Notifications
You must be signed in to change notification settings - Fork 332
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Split the resource semantic webhooks into separate AdmissionControllers
By combining our validation logic into our mutating webhook we were previously allowing for mutating webhooks evaluated after our own to modify our resources into invalid shapes. There are no guarantees around ordering of mutating webhooks (that I could find), so the only way to remedy this properly is to split apart the two into separate webhook configurations: - `defaulting`: which runs during the mutating admission webhook phase - `validation`: which runs during the validating admission webhook phase. The diagram in [this post](https://kubernetes.io/blog/2019/03/21/a-guide-to-kubernetes-admission-controllers/) is very helpful in illustrating the flow of webhooks. Fixes: #847
- Loading branch information
Showing
13 changed files
with
1,150 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| Copyright 2019 The Knative Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package resourcesemantics | ||
|
|
||
| import ( | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "knative.dev/pkg/apis" | ||
| ) | ||
|
|
||
| // GenericCRD is the interface definition that allows us to perform the generic | ||
| // CRD actions like deciding whether to increment generation and so forth. | ||
| type GenericCRD interface { | ||
| apis.Defaultable | ||
| apis.Validatable | ||
| runtime.Object | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| Copyright 2019 The Knative Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package validation | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| // Injection stuff | ||
| kubeclient "knative.dev/pkg/client/injection/kube/client" | ||
| vwhinformer "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration" | ||
| secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret" | ||
|
|
||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| "k8s.io/client-go/tools/cache" | ||
| "knative.dev/pkg/controller" | ||
| "knative.dev/pkg/logging" | ||
| "knative.dev/pkg/system" | ||
| "knative.dev/pkg/webhook" | ||
| "knative.dev/pkg/webhook/resourcesemantics" | ||
| ) | ||
|
|
||
| // NewAdmissionController constructs a reconciler | ||
| func NewAdmissionController( | ||
| ctx context.Context, | ||
| name, path string, | ||
| handlers map[schema.GroupVersionKind]resourcesemantics.GenericCRD, | ||
| wc func(context.Context) context.Context, | ||
| disallowUnknownFields bool, | ||
| ) *controller.Impl { | ||
|
|
||
| client := kubeclient.Get(ctx) | ||
| vwhInformer := vwhinformer.Get(ctx) | ||
| secretInformer := secretinformer.Get(ctx) | ||
| options := webhook.GetOptions(ctx) | ||
|
|
||
| wh := &reconciler{ | ||
| name: name, | ||
| path: path, | ||
| handlers: handlers, | ||
|
|
||
| withContext: wc, | ||
| disallowUnknownFields: disallowUnknownFields, | ||
| secretName: options.SecretName, | ||
|
|
||
| client: client, | ||
| vwhlister: vwhInformer.Lister(), | ||
| secretlister: secretInformer.Lister(), | ||
| } | ||
|
|
||
| logger := logging.FromContext(ctx) | ||
| c := controller.NewImpl(wh, logger, "ConfigMapWebhook") | ||
|
|
||
| // Reconcile when the named ValidatingWebhookConfiguration changes. | ||
| vwhInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ | ||
| FilterFunc: controller.FilterWithName(name), | ||
| // It doesn't matter what we enqueue because we will always Reconcile | ||
| // the named VWH resource. | ||
| Handler: controller.HandleAll(c.Enqueue), | ||
| }) | ||
|
|
||
| // Reconcile when the cert bundle changes. | ||
| secretInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{ | ||
| FilterFunc: controller.FilterWithNameAndNamespace(system.Namespace(), wh.secretName), | ||
| // It doesn't matter what we enqueue because we will always Reconcile | ||
| // the named VWH resource. | ||
| Handler: controller.HandleAll(c.Enqueue), | ||
| }) | ||
|
|
||
| return c | ||
| } |
Oops, something went wrong.