simplify mock AppWrapper webhooks

Author: dgrove-oss

main.go

@@ -145,9 +145,8 @@ func main() {
 			CertGeneratorImage:       "registry.access.redhat.com/ubi9@sha256:770cf07083e1c85ae69c25181a205b7cdef63c11b794c89b3b487d4670b4c328",
 		},
 		AppWrapper: &config.AppWrapperConfiguration{
-			Enabled:            ptr.To(false),
-			ExternalController: ptr.To(false),
-			Config:             awconfig.NewAppWrapperConfig(),
+			Enabled: ptr.To(false),
+			Config:  awconfig.NewAppWrapperConfig(),
 		},
 	}
 
@@ -239,11 +238,10 @@ func setupAppWrapperComponents(ctx context.Context, cancel context.CancelFunc, m
 	cfg *config.CodeFlareOperatorConfiguration, certsReady chan struct{}) error {
 	if cfg.AppWrapper == nil || !ptr.Deref(cfg.AppWrapper.Enabled, false) {
 		setupLog.Info("Embedded AppWrapper controller is disabled by config")
-		externalController := cfg.AppWrapper != nil && ptr.Deref(cfg.AppWrapper.ExternalController, false)
 		go func() {
 			<-certsReady
-			setupLog.Info("Setting up mock AppWrapper webhooks", "externalController", externalController)
-			exitOnError(controllers.SetupMockAppWrapperWebhooks(mgr, externalController), "unable to setup AppWrapper webhooks")
+			setupLog.Info("Setting up mock AppWrapper webhooks")
+			exitOnError(controllers.SetupMockAppWrapperWebhooks(mgr), "unable to setup AppWrapper webhooks")
 		}()
 		return nil
 	}

pkg/config/config.go

@@ -38,8 +38,6 @@ type CodeFlareOperatorConfiguration struct {
 type AppWrapperConfiguration struct {
 	// Enabled controls whether or not the AppWrapper Controller is enabled
 	Enabled *bool `json:"enabled,omitempty"`
-	// ExternalController indicates that an AppWrapper Controller external to the Codeflare Operator is deployed
-	ExternalController *bool `json:"externalController,omitempty"`
 	// AppWrapper contains the AppWrapper controller configuration
 	Config *awconfig.AppWrapperConfig `json:"config,omitempty"`
 }

pkg/controllers/appwrapper_webhook.go

@@ -18,7 +18,6 @@ package controllers
 
 import (
 	"context"
-	"fmt"
 
 	awv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
 
@@ -36,36 +35,31 @@ import (
 //+kubebuilder:rbac:groups=authorization.k8s.io,resources=subjectaccessreviews,verbs=create
 //+kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=list
 
-type appwrapperWebhook struct {
-	externalController bool
+type mockAppWrapperWebhook struct {
 }
 
-var _ webhook.CustomDefaulter = &appwrapperWebhook{}
+var _ webhook.CustomDefaulter = &mockAppWrapperWebhook{}
 
-func (w *appwrapperWebhook) Default(ctx context.Context, obj runtime.Object) error {
+func (w *mockAppWrapperWebhook) Default(ctx context.Context, obj runtime.Object) error {
 	return nil
 }
 
-var _ webhook.CustomValidator = &appwrapperWebhook{}
+var _ webhook.CustomValidator = &mockAppWrapperWebhook{}
 
-func (w *appwrapperWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
-	if w.externalController {
-		return nil, nil
-	} else {
-		return nil, fmt.Errorf("AppWrappers disabled by CodeFlare operator configuration")
-	}
+func (w *mockAppWrapperWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	return nil, nil
 }
 
-func (w *appwrapperWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+func (w *mockAppWrapperWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
 
-func (w *appwrapperWebhook) ValidateDelete(context.Context, runtime.Object) (admission.Warnings, error) {
+func (w *mockAppWrapperWebhook) ValidateDelete(context.Context, runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
 
-func SetupMockAppWrapperWebhooks(mgr ctrl.Manager, externalController bool) error {
-	wh := &appwrapperWebhook{externalController: externalController}
+func SetupMockAppWrapperWebhooks(mgr ctrl.Manager) error {
+	wh := &mockAppWrapperWebhook{}
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&awv1beta2.AppWrapper{}).
 		WithDefaulter(wh).