webhooks: make SGX mutator registration to follow other webhooks

Signed-off-by: Mikko Ylinen <[email protected]>

Author: mythi

cmd/operator/main.go

@@ -21,7 +21,6 @@ import (
 	"os"
 	"strings"
 
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -44,7 +43,6 @@ import (
 	"github.com/intel/intel-device-plugins-for-kubernetes/pkg/fpgacontroller"
 	"github.com/intel/intel-device-plugins-for-kubernetes/pkg/fpgacontroller/patcher"
 	sgxwebhook "github.com/intel/intel-device-plugins-for-kubernetes/pkg/webhooks/sgx"
-	"sigs.k8s.io/controller-runtime/pkg/builder"
 )
 
 var (
@@ -176,10 +174,7 @@ func main() {
 	}
 
 	if contains(devices, "sgx") {
-		if err = builder.WebhookManagedBy(mgr).
-			For(&corev1.Pod{}).
-			WithDefaulter(&sgxwebhook.Mutator{}).
-			Complete(); err != nil {
+		if err := (&sgxwebhook.Mutator{}).SetupWebhookWithManager(mgr); err != nil {
 			setupLog.Error(err, "unable to create webhook", "webhook", "Pod")
 			os.Exit(1)
 		}

cmd/sgx_admissionwebhook/main.go

@@ -20,10 +20,8 @@ import (
 	"os"
 
 	sgxwebhook "github.com/intel/intel-device-plugins-for-kubernetes/pkg/webhooks/sgx"
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/klog/v2/textlogger"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/builder"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
@@ -59,10 +57,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err := builder.WebhookManagedBy(mgr).
-		For(&corev1.Pod{}).
-		WithDefaulter(&sgxwebhook.Mutator{}).
-		Complete(); err != nil {
+	if err := (&sgxwebhook.Mutator{}).SetupWebhookWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create webhook", "webhook", "Pod")
 		os.Exit(1)
 	}

pkg/webhooks/sgx/sgx.go

@@ -22,6 +22,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
+	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
 	"github.com/intel/intel-device-plugins-for-kubernetes/pkg/internal/containers"
@@ -34,6 +35,13 @@ var ErrObjectType = errors.New("invalid runtime object type")
 // Mutator annotates Pods.
 type Mutator struct{}
 
+func (r *Mutator) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(&corev1.Pod{}).
+		WithDefaulter(r).
+		Complete()
+}
+
 const (
 	namespace                = "sgx.intel.com"
 	encl                     = namespace + "/enclave"