Hook up v1a2 webhooks

vmware-tanzu · Sep 27, 2023 · 37f10c8 · 37f10c8
1 parent f18366f
commit 37f10c8
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 4 deletions.
diff --git a/webhooks/virtualmachine/webhooks.go b/webhooks/virtualmachine/webhooks.go
@@ -9,12 +9,21 @@ import (
 	ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/vmware-tanzu/vm-operator/pkg/context"
+	"github.com/vmware-tanzu/vm-operator/pkg/lib"
 	"github.com/vmware-tanzu/vm-operator/webhooks/virtualmachine/v1alpha1"
+	"github.com/vmware-tanzu/vm-operator/webhooks/virtualmachine/v1alpha2"
 )
 
 func AddToManager(ctx *context.ControllerManagerContext, mgr ctrlmgr.Manager) error {
-	if err := v1alpha1.AddToManager(ctx, mgr); err != nil {
-		return errors.Wrap(err, "failed to initialize v1alpha1 webhooks")
+	if lib.IsVMServiceV1Alpha2FSSEnabled() {
+		// TODO: We'll likely still need the v1a1 mutation wehbook (at least some limited version of it)
+		if err := v1alpha2.AddToManager(ctx, mgr); err != nil {
+			return errors.Wrap(err, "failed to initialize v1alpha2 webhooks")
+		}
+	} else {
+		if err := v1alpha1.AddToManager(ctx, mgr); err != nil {
+			return errors.Wrap(err, "failed to initialize v1alpha1 webhooks")
+		}
 	}
 
 	return nil

diff --git a/webhooks/virtualmachineclass/v1alpha2/webhooks.go b/webhooks/virtualmachineclass/v1alpha2/webhooks.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2019-2023 VMware, Inc. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package virtualmachineclass
+package v1alpha2
 
 import (
 	"github.com/pkg/errors"

diff --git a/webhooks/virtualmachineclass/webhooks.go b/webhooks/virtualmachineclass/webhooks.go
@@ -7,9 +7,15 @@ import (
 	ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/vmware-tanzu/vm-operator/pkg/context"
+	"github.com/vmware-tanzu/vm-operator/pkg/lib"
 	"github.com/vmware-tanzu/vm-operator/webhooks/virtualmachineclass/v1alpha1"
+	"github.com/vmware-tanzu/vm-operator/webhooks/virtualmachineclass/v1alpha2"
 )
 
 func AddToManager(ctx *context.ControllerManagerContext, mgr ctrlmgr.Manager) error {
+	if lib.IsVMServiceV1Alpha2FSSEnabled() {
+		return v1alpha2.AddToManager(ctx, mgr)
+	}
+
 	return v1alpha1.AddToManager(ctx, mgr)
 }
diff --git a/webhooks/virtualmachinepublishrequest/v1alpha2/webhooks.go b/webhooks/virtualmachinepublishrequest/v1alpha2/webhooks.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2022-2023 VMware, Inc. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package virtualmachinepublishrequest
+package v1alpha2
 
 import (
 	"github.com/pkg/errors"

diff --git a/webhooks/virtualmachinepublishrequest/webhooks.go b/webhooks/virtualmachinepublishrequest/webhooks.go
@@ -7,9 +7,14 @@ import (
 	ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/vmware-tanzu/vm-operator/pkg/context"
+	"github.com/vmware-tanzu/vm-operator/pkg/lib"
 	"github.com/vmware-tanzu/vm-operator/webhooks/virtualmachinepublishrequest/v1alpha1"
+	"github.com/vmware-tanzu/vm-operator/webhooks/virtualmachinepublishrequest/v1alpha2"
 )
 
 func AddToManager(ctx *context.ControllerManagerContext, mgr ctrlmgr.Manager) error {
+	if lib.IsVMServiceV1Alpha2FSSEnabled() {
+		return v1alpha2.AddToManager(ctx, mgr)
+	}
 	return v1alpha1.AddToManager(ctx, mgr)
 }
diff --git a/webhooks/virtualmachineservice/webhooks.go b/webhooks/virtualmachineservice/webhooks.go
@@ -7,9 +7,14 @@ import (
 	ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/vmware-tanzu/vm-operator/pkg/context"
+	"github.com/vmware-tanzu/vm-operator/pkg/lib"
 	"github.com/vmware-tanzu/vm-operator/webhooks/virtualmachineservice/v1alpha1"
+	"github.com/vmware-tanzu/vm-operator/webhooks/virtualmachineservice/v1alpha2"
 )
 
 func AddToManager(ctx *context.ControllerManagerContext, mgr ctrlmgr.Manager) error {
+	if lib.IsVMServiceV1Alpha2FSSEnabled() {
+		return v1alpha2.AddToManager(ctx, mgr)
+	}
 	return v1alpha1.AddToManager(ctx, mgr)
 }
diff --git a/webhooks/virtualmachinesetresourcepolicy/webhooks.go b/webhooks/virtualmachinesetresourcepolicy/webhooks.go
@@ -7,9 +7,14 @@ import (
 	ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/vmware-tanzu/vm-operator/pkg/context"
+	"github.com/vmware-tanzu/vm-operator/pkg/lib"
 	"github.com/vmware-tanzu/vm-operator/webhooks/virtualmachinesetresourcepolicy/v1alpha1"
+	"github.com/vmware-tanzu/vm-operator/webhooks/virtualmachinesetresourcepolicy/v1alpha2"
 )
 
 func AddToManager(ctx *context.ControllerManagerContext, mgr ctrlmgr.Manager) error {
+	if lib.IsVMServiceV1Alpha2FSSEnabled() {
+		return v1alpha2.AddToManager(ctx, mgr)
+	}
 	return v1alpha1.AddToManager(ctx, mgr)
 }