Skip to content

Commit daa1056

Browse files
committed
adopt controller-runtime changes
1 parent b6f6d54 commit daa1056

1 file changed

Lines changed: 4 additions & 13 deletions

File tree

webhooks/project_webhook.go

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
admissionv1 "k8s.io/api/admission/v1"
1818
authorizationv1 "k8s.io/api/authorization/v1"
1919
apierrors "k8s.io/apimachinery/pkg/api/errors"
20-
"k8s.io/apimachinery/pkg/runtime"
2120
ctrl "sigs.k8s.io/controller-runtime"
2221
"sigs.k8s.io/controller-runtime/pkg/client"
2322
logf "sigs.k8s.io/controller-runtime/pkg/log"
@@ -51,9 +50,7 @@ func NewProjectWebhook(client client.Client, options ProjectReconcilerOptions) *
5150
}
5251
}
5352

54-
func (w *ProjectWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
55-
// note: it should be safe to cast obj to *Project
56-
project := obj.(*corev1alpha1.Project)
53+
func (w *ProjectWebhook) ValidateCreate(ctx context.Context, project *corev1alpha1.Project) (admission.Warnings, error) {
5754
projectlog.Info("validate create", "name", project.Name)
5855

5956
if err := w.validate(ctx, project); err != nil {
@@ -63,10 +60,7 @@ func (w *ProjectWebhook) ValidateCreate(ctx context.Context, obj runtime.Object)
6360
return nil, nil
6461
}
6562

66-
func (w *ProjectWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
67-
// note: it should be safe to cast oldObj, newObj to *Project
68-
oldProject := oldObj.(*corev1alpha1.Project)
69-
newProject := newObj.(*corev1alpha1.Project)
63+
func (w *ProjectWebhook) ValidateUpdate(ctx context.Context, oldProject, newProject *corev1alpha1.Project) (admission.Warnings, error) {
7064
projectlog.Info("validate update", "name", newProject.Name)
7165

7266
if err := w.validate(ctx, newProject); err != nil {
@@ -76,9 +70,7 @@ func (w *ProjectWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runt
7670
return nil, w.authorize(ctx, oldProject)
7771
}
7872

79-
func (w *ProjectWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
80-
// note: it should be safe to cast obj to *Project
81-
project := obj.(*corev1alpha1.Project)
73+
func (w *ProjectWebhook) ValidateDelete(ctx context.Context, project *corev1alpha1.Project) (admission.Warnings, error) {
8274
projectlog.Info("validate delete", "name", project.Name)
8375

8476
return nil, w.authorize(ctx, project)
@@ -159,8 +151,7 @@ func (w *ProjectWebhook) authorize(ctx context.Context, project *corev1alpha1.Pr
159151
}
160152

161153
func (w *ProjectWebhook) SetupWebhookWithManager(mgr ctrl.Manager) error {
162-
return ctrl.NewWebhookManagedBy(mgr).
163-
For(&corev1alpha1.Project{}).
154+
return ctrl.NewWebhookManagedBy(mgr, &corev1alpha1.Project{}).
164155
WithValidator(w).
165156
Complete()
166157
}

0 commit comments

Comments
 (0)