replace validatingwebhookconfiguration controller with watch in stora…

…gepolicyquota controller
vmware-tanzu · Nov 6, 2024 · 6305b07 · 6305b07
1 parent 7941a83
commit 6305b07
Show file tree

Hide file tree

Showing 10 changed files with 543 additions and 668 deletions.
diff --git a/controllers/infra/controllers.go b/controllers/infra/controllers.go
@@ -12,7 +12,6 @@ import (
 	"github.com/vmware-tanzu/vm-operator/controllers/infra/configmap"
 	"github.com/vmware-tanzu/vm-operator/controllers/infra/node"
 	"github.com/vmware-tanzu/vm-operator/controllers/infra/secret"
-	"github.com/vmware-tanzu/vm-operator/controllers/infra/validatingwebhookconfiguration"
 	"github.com/vmware-tanzu/vm-operator/controllers/infra/zone"
 	pkgcfg "github.com/vmware-tanzu/vm-operator/pkg/config"
 	pkgctx "github.com/vmware-tanzu/vm-operator/pkg/context"
@@ -32,11 +31,6 @@ func AddToManager(ctx *pkgctx.ControllerManagerContext, mgr manager.Manager) err
 	if err := secret.AddToManager(ctx, mgr); err != nil {
 		return fmt.Errorf("failed to initialize infra secret controller: %w", err)
 	}
-	if pkgcfg.FromContext(ctx).Features.UnifiedStorageQuota {
-		if err := validatingwebhookconfiguration.AddToManager(ctx, mgr); err != nil {
-			return fmt.Errorf("failed to initialize validatingwebhookconfiguration webhook controller: %w", err)
-		}
-	}
 	if pkgcfg.FromContext(ctx).Features.WorkloadDomainIsolation {
 		if err := zone.AddToManager(ctx, mgr); err != nil {
 			return fmt.Errorf("failed to initialize infra zone controller: %w", err)

diff --git a/...rollers/infra/validatingwebhookconfiguration/validatingwebhookconfiguration_controller.go b/...rollers/infra/validatingwebhookconfiguration/validatingwebhookconfiguration_controller.go
diff --git a/...fra/validatingwebhookconfiguration/validatingwebhookconfiguration_controller_intg_test.go b/...fra/validatingwebhookconfiguration/validatingwebhookconfiguration_controller_intg_test.go