Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor webhook organization (#711)
- Loading branch information
1 parent
de96a52
commit 6d4dd47
Showing
7 changed files
with
104 additions
and
64 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
File renamed without changes.
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,88 @@ | ||
| /* | ||
| 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 webhook | ||
|
|
||
| import ( | ||
| "os" | ||
|
|
||
| experimentsv1alpha2 "github.com/kubeflow/katib/pkg/api/operators/apis/experiment/v1alpha2" | ||
| "github.com/kubeflow/katib/pkg/webhook/v1alpha2/experiment" | ||
|
|
||
| admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
|
|
||
| "sigs.k8s.io/controller-runtime/pkg/manager" | ||
| "sigs.k8s.io/controller-runtime/pkg/webhook" | ||
| "sigs.k8s.io/controller-runtime/pkg/webhook/admission/builder" | ||
| ) | ||
|
|
||
| const katibControllerName = "katib-controller" | ||
|
|
||
| func AddToManager(m manager.Manager) error { | ||
| server, err := webhook.NewServer("katib-admission-server", m, webhook.ServerOptions{ | ||
| CertDir: "/tmp/cert", | ||
| BootstrapOptions: &webhook.BootstrapOptions{ | ||
| Secret: &types.NamespacedName{ | ||
| Namespace: os.Getenv(experimentsv1alpha2.DefaultKatibNamespaceEnvName), | ||
| Name: katibControllerName, | ||
| }, | ||
| Service: &webhook.Service{ | ||
| Namespace: os.Getenv(experimentsv1alpha2.DefaultKatibNamespaceEnvName), | ||
| Name: katibControllerName, | ||
| Selectors: map[string]string{ | ||
| "app": katibControllerName, | ||
| }, | ||
| }, | ||
| ValidatingWebhookConfigName: "katib-validating-webhook-config", | ||
| MutatingWebhookConfigName: "katib-mutating-webhook-config", | ||
| }, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := register(m, server); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func register(manager manager.Manager, server *webhook.Server) error { | ||
| mutatingWebhook, err := builder.NewWebhookBuilder(). | ||
| Name("mutating.experiment.kubeflow.org"). | ||
| Mutating(). | ||
| Operations(admissionregistrationv1beta1.Create, admissionregistrationv1beta1.Update). | ||
| WithManager(manager). | ||
| ForType(&experimentsv1alpha2.Experiment{}). | ||
| Handlers(experiment.NewExperimentDefaulter(manager.GetClient())). | ||
| Build() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| validatingWebhook, err := builder.NewWebhookBuilder(). | ||
| Name("validating.experiment.kubeflow.org"). | ||
| Validating(). | ||
| Operations(admissionregistrationv1beta1.Create, admissionregistrationv1beta1.Update). | ||
| WithManager(manager). | ||
| ForType(&experimentsv1alpha2.Experiment{}). | ||
| Handlers(experiment.NewExperimentValidator(manager.GetClient())). | ||
| Build() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return server.Register(mutatingWebhook, validatingWebhook) | ||
| } |