Skip to content

Commit 980311d

Browse files
drop mock appwrapper webhook
1 parent d75fcdc commit 980311d

File tree

2 files changed

+0
-48
lines changed

2 files changed

+0
-48
lines changed

main.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,6 @@ func setupAppWrapperComponents(ctx context.Context, cancel context.CancelFunc, m
238238
cfg *config.CodeFlareOperatorConfiguration, certsReady chan struct{}) error {
239239
if cfg.AppWrapper == nil || !ptr.Deref(cfg.AppWrapper.Enabled, false) {
240240
setupLog.Info("Embedded AppWrapper controller is disabled by config")
241-
go func() {
242-
<-certsReady
243-
setupLog.Info("Setting up mock AppWrapper webhooks")
244-
exitOnError(controllers.SetupMockAppWrapperWebhooks(mgr), "unable to setup AppWrapper webhooks")
245-
}()
246241
return nil
247242
}
248243

pkg/controllers/appwrapper_webhook.go

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -16,53 +16,10 @@ limitations under the License.
1616

1717
package controllers
1818

19-
import (
20-
"context"
21-
22-
awv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
23-
24-
"k8s.io/apimachinery/pkg/runtime"
25-
ctrl "sigs.k8s.io/controller-runtime"
26-
"sigs.k8s.io/controller-runtime/pkg/webhook"
27-
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
28-
)
29-
3019
// webhook configuration
3120
//+kubebuilder:webhook:path=/mutate-workload-codeflare-dev-v1beta2-appwrapper,mutating=true,failurePolicy=fail,sideEffects=None,groups=workload.codeflare.dev,resources=appwrappers,verbs=create,versions=v1beta2,name=mappwrapper.kb.io,admissionReviewVersions=v1
3221
//+kubebuilder:webhook:path=/validate-workload-codeflare-dev-v1beta2-appwrapper,mutating=false,failurePolicy=fail,sideEffects=None,groups=workload.codeflare.dev,resources=appwrappers,verbs=create;update,versions=v1beta2,name=vappwrapper.kb.io,admissionReviewVersions=v1
3322

3423
// permissions needed by the "real" Webhook in the appwrapper project to enable SubjectAccessReview
3524
//+kubebuilder:rbac:groups=authorization.k8s.io,resources=subjectaccessreviews,verbs=create
3625
//+kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=list
37-
38-
type mockAppWrapperWebhook struct {
39-
}
40-
41-
var _ webhook.CustomDefaulter = &mockAppWrapperWebhook{}
42-
43-
func (w *mockAppWrapperWebhook) Default(ctx context.Context, obj runtime.Object) error {
44-
return nil
45-
}
46-
47-
var _ webhook.CustomValidator = &mockAppWrapperWebhook{}
48-
49-
func (w *mockAppWrapperWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
50-
return nil, nil
51-
}
52-
53-
func (w *mockAppWrapperWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
54-
return nil, nil
55-
}
56-
57-
func (w *mockAppWrapperWebhook) ValidateDelete(context.Context, runtime.Object) (admission.Warnings, error) {
58-
return nil, nil
59-
}
60-
61-
func SetupMockAppWrapperWebhooks(mgr ctrl.Manager) error {
62-
wh := &mockAppWrapperWebhook{}
63-
return ctrl.NewWebhookManagedBy(mgr).
64-
For(&awv1beta2.AppWrapper{}).
65-
WithDefaulter(wh).
66-
WithValidator(wh).
67-
Complete()
68-
}

0 commit comments

Comments
 (0)