operator: move deviceplugin/v1 CRDs to cluster scope

mythi · mythi · commit 37618d4f850f · 2021-02-11T11:41:47.000+02:00
The device plugins daemonsets are cluster wide and currently only
one device plugin instance per device is possible so making the
corresponding deviceplugin/v1 CRDs non-namespaced (i.e., scope: cluster)
fits better.

Previously, the device plugin daemonset was deployed in the same
namespace as the CR for that device but with the cluster scoped CRDs
we default to use the same namespace as the operator, unless overridden
via DEVICEPLUGIN_NAMESPACE env variable or a command line parameter
to operator manager deployment.

Three additional changes in this commit:
- enable DSA envtest tests
- update controller-runtime to v0.8.1
- change device plugin envtest suite to use klog/v2

Signed-off-by: Mikko Ylinen &lt;mikko.ylinen@intel.com&gt;
diff --git a/cmd/operator/main.go b/cmd/operator/main.go
@@ -18,6 +18,7 @@ import (
 	"flag"
 	"os"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/klog/v2/klogr"
@@ -51,17 +52,29 @@ func init() {
 	// +kubebuilder:scaffold:scheme
 }
 
+type devicePluginControllerAndWebhook map[string](func(ctrl.Manager, string, bool) error)
+
 func main() {
 	var metricsAddr string
+	var devicePluginNamespace string
 	var enableLeaderElection bool
 	flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
+	flag.StringVar(&devicePluginNamespace, "deviceplugin-namespace", metav1.NamespaceSystem, "The namespace where deviceplugin daemonsets are created")
 	flag.BoolVar(&enableLeaderElection, "enable-leader-election", false,
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")
 	flag.Parse()
 
 	ctrl.SetLogger(klogr.New())
 
+	setupControllerAndWebhook := devicePluginControllerAndWebhook{
+		"dsa":  dsa.SetupReconciler,
+		"gpu":  gpu.SetupReconciler,
+		"fpga": fpga.SetupReconciler,
+		"qat":  qat.SetupReconciler,
+		"sgx":  sgx.SetupReconciler,
+	}
+
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:             scheme,
 		MetricsBindAddress: metricsAddr,
@@ -75,40 +88,19 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = dsa.SetupReconciler(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "DsaDevicePlugin")
-		os.Exit(1)
-	}
-	if err = (&devicepluginv1.DsaDevicePlugin{}).SetupWebhookWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create webhook", "webhook", "DsaDevicePlugin")
-		os.Exit(1)
+	ns := os.Getenv("DEVICEPLUGIN_NAMESPACE")
+	if ns == "" {
+		ns = devicePluginNamespace
 	}
 
-	if err = gpu.SetupReconciler(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "GpuDevicePlugin")
-		os.Exit(1)
-	}
-	if err = (&devicepluginv1.GpuDevicePlugin{}).SetupWebhookWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create webhook", "webhook", "GpuDevicePlugin")
-		os.Exit(1)
-	}
+	withWebhook := true
 
-	if err = qat.SetupReconciler(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "QatDevicePlugin")
-		os.Exit(1)
-	}
-	if err = (&devicepluginv1.QatDevicePlugin{}).SetupWebhookWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create webhook", "webhook", "QatDevicePlugin")
-		os.Exit(1)
-	}
-
-	if err = sgx.SetupReconciler(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "SgxDevicePlugin")
-		os.Exit(1)
-	}
-	if err = (&devicepluginv1.SgxDevicePlugin{}).SetupWebhookWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create webhook", "webhook", "SgxDevicePlugin")
-		os.Exit(1)
+	// TODO(mythi): add a StringVar flag to select which controllers to enable
+	for _, device := range []string{"dsa", "fpga", "gpu", "qat", "sgx"} {
+		if err = setupControllerAndWebhook[device](mgr, ns, withWebhook); err != nil {
+			setupLog.Error(err, "unable to initialize controller", "controller", device)
+			os.Exit(1)
+		}
 	}
 
 	pm := patcher.NewPatcherManager(mgr.GetLogger().WithName("webhooks").WithName("Fpga"))
@@ -121,15 +113,6 @@ func main() {
 		Handler: &sgxwebhook.SgxMutator{Client: mgr.GetClient()},
 	})
 
-	if err = fpga.SetupReconciler(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "FpgaDevicePlugin")
-		os.Exit(1)
-	}
-	if err = (&devicepluginv1.FpgaDevicePlugin{}).SetupWebhookWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create webhook", "webhook", "FpgaDevicePlugin")
-		os.Exit(1)
-	}
-
 	if err = (&fpgacontroller.AcceleratorFunctionReconciler{
 		Client:         mgr.GetClient(),
 		Scheme:         mgr.GetScheme(),
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml
@@ -27,7 +27,7 @@ spec:
     listKind: DsaDevicePluginList
     plural: dsadeviceplugins
     singular: dsadeviceplugin
-  scope: Namespaced
+  scope: Cluster
   subresources:
     status: {}
   validation:
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml
@@ -27,7 +27,7 @@ spec:
     listKind: FpgaDevicePluginList
     plural: fpgadeviceplugins
     singular: fpgadeviceplugin
-  scope: Namespaced
+  scope: Cluster
   subresources:
     status: {}
   validation:
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml
@@ -27,7 +27,7 @@ spec:
     listKind: GpuDevicePluginList
     plural: gpudeviceplugins
     singular: gpudeviceplugin
-  scope: Namespaced
+  scope: Cluster
   subresources:
     status: {}
   validation:
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml
@@ -27,7 +27,7 @@ spec:
     listKind: QatDevicePluginList
     plural: qatdeviceplugins
     singular: qatdeviceplugin
-  scope: Namespaced
+  scope: Cluster
   subresources:
     status: {}
   validation:
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml
@@ -27,7 +27,7 @@ spec:
     listKind: SgxDevicePluginList
     plural: sgxdeviceplugins
     singular: sgxdeviceplugin
-  scope: Namespaced
+  scope: Cluster
   subresources:
     status: {}
   validation:
diff --git a/deployments/operator/manager/manager.yaml b/deployments/operator/manager/manager.yaml
@@ -38,5 +38,10 @@ spec:
           runAsUser: 3210
           runAsGroup: 3210
           readOnlyRootFilesystem: true
+        env:
+          - name: DEVICEPLUGIN_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
       serviceAccountName: default
       terminationGracePeriodSeconds: 10
diff --git a/go.mod b/go.mod
@@ -20,8 +20,8 @@ require (
 	k8s.io/klog/v2 v2.4.0
 	k8s.io/kubelet v0.20.2
 	k8s.io/kubernetes v1.20.2
-	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
-	sigs.k8s.io/controller-runtime v0.7.0
+	k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
+	sigs.k8s.io/controller-runtime v0.8.1
 )
 
 replace (
diff --git a/go.sum b/go.sum
@@ -1001,10 +1001,10 @@ k8s.io/metrics v0.20.2/go.mod h1:yTck5nl5wt/lIeLcU6g0b8/AKJf2girwe0PQiaM4Mwk=
 k8s.io/mount-utils v0.20.3-rc.0/go.mod h1:Jv9NRZ5L2LF87A17GaGlArD+r3JAJdZFvo4XD1cG4Kc=
 k8s.io/sample-apiserver v0.20.2/go.mod h1:Q4VuPfFr3WOSkv6XKmY8FukZESdtH5MWqO0umFDfHcM=
 k8s.io/system-validators v1.2.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
-k8s.io/utils v0.0.0-20200912215256-4140de9c8800 h1:9ZNvfPvVIEsp/T1ez4GQuzCcCTEQWhovSofhqR73A6g=
-k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ=
+k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
@@ -1016,8 +1016,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14 h1:TihvEz9MPj2u0KWds6E2OBUXfwaL4qRJ33c7HGiJpqk=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
-sigs.k8s.io/controller-runtime v0.7.0 h1:bU20IBBEPccWz5+zXpLnpVsgBYxqclaHu1pVDl/gEt8=
-sigs.k8s.io/controller-runtime v0.7.0/go.mod h1:pJ3YBrJiAqMAZKi6UVGuE98ZrroV1p+pIhoHsMm9wdU=
+sigs.k8s.io/controller-runtime v0.8.1 h1:O0K2CJ2JavK8/Tf4LfcpAwRxOFBhv8DjyrbmE6Qw59s=
+sigs.k8s.io/controller-runtime v0.8.1/go.mod h1:U/l+DUopBc1ecfRZ5aviA9JDmGFQKvLf5YkZNx2e0sU=
 sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
diff --git a/pkg/apis/deviceplugin/v1/dsadeviceplugin_types.go b/pkg/apis/deviceplugin/v1/dsadeviceplugin_types.go
@@ -63,6 +63,7 @@ type DsaDevicePluginStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=dsadeviceplugins,scope=Cluster
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Desired",type=integer,JSONPath=`.status.desiredNumberScheduled`
 // +kubebuilder:printcolumn:name="Ready",type=integer,JSONPath=`.status.numberReady`
diff --git a/pkg/apis/deviceplugin/v1/fpgadeviceplugin_types.go b/pkg/apis/deviceplugin/v1/fpgadeviceplugin_types.go
@@ -66,6 +66,7 @@ type FpgaDevicePluginStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=fpgadeviceplugins,scope=Cluster
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Desired",type=integer,JSONPath=`.status.desiredNumberScheduled`
 // +kubebuilder:printcolumn:name="Ready",type=integer,JSONPath=`.status.numberReady`
diff --git a/pkg/apis/deviceplugin/v1/gpudeviceplugin_types.go b/pkg/apis/deviceplugin/v1/gpudeviceplugin_types.go
@@ -67,6 +67,7 @@ type GpuDevicePluginStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=gpudeviceplugins,scope=Cluster
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Desired",type=integer,JSONPath=`.status.desiredNumberScheduled`
 // +kubebuilder:printcolumn:name="Ready",type=integer,JSONPath=`.status.numberReady`
diff --git a/pkg/apis/deviceplugin/v1/qatdeviceplugin_types.go b/pkg/apis/deviceplugin/v1/qatdeviceplugin_types.go
@@ -76,6 +76,7 @@ type QatDevicePluginStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=qatdeviceplugins,scope=Cluster
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Desired",type=integer,JSONPath=`.status.desiredNumberScheduled`
 // +kubebuilder:printcolumn:name="Ready",type=integer,JSONPath=`.status.numberReady`
diff --git a/pkg/apis/deviceplugin/v1/sgxdeviceplugin_types.go b/pkg/apis/deviceplugin/v1/sgxdeviceplugin_types.go
@@ -70,6 +70,7 @@ type SgxDevicePluginStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=sgxdeviceplugins,scope=Cluster
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Desired",type=integer,JSONPath=`.status.desiredNumberScheduled`
 // +kubebuilder:printcolumn:name="Ready",type=integer,JSONPath=`.status.numberReady`
diff --git a/pkg/controllers/dsa/controller.go b/pkg/controllers/dsa/controller.go
@@ -43,13 +43,22 @@ const (
 // +kubebuilder:rbac:groups=deviceplugin.intel.com,resources=dsadeviceplugins/status,verbs=get;update;patch
 
 // SetupReconciler creates a new reconciler for DsaDevicePlugin objects.
-func SetupReconciler(mgr ctrl.Manager) error {
-	c := &controller{scheme: mgr.GetScheme()}
-	return controllers.SetupWithManager(mgr, c, devicepluginv1.GroupVersion.String(), "DsaDevicePlugin", ownerKey)
+func SetupReconciler(mgr ctrl.Manager, namespace string, withWebhook bool) error {
+	c := &controller{scheme: mgr.GetScheme(), ns: namespace}
+	if err := controllers.SetupWithManager(mgr, c, devicepluginv1.GroupVersion.String(), "DsaDevicePlugin", ownerKey); err != nil {
+		return err
+	}
+
+	if withWebhook {
+		return (&devicepluginv1.DsaDevicePlugin{}).SetupWebhookWithManager(mgr)
+	}
+
+	return nil
 }
 
 type controller struct {
 	scheme *runtime.Scheme
+	ns     string
 }
 
 func (c *controller) CreateEmptyObject() client.Object {
@@ -83,7 +92,7 @@ func (c *controller) NewDaemonSet(rawObj client.Object) *apps.DaemonSet {
 	yes := true
 	daemonSet := apps.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace:    devicePlugin.Namespace,
+			Namespace:    c.ns,
 			GenerateName: devicePlugin.Name + "-",
 			Labels: map[string]string{
 				"app": appLabel,
diff --git a/pkg/controllers/fpga/controller.go b/pkg/controllers/fpga/controller.go
@@ -43,13 +43,22 @@ const (
 // +kubebuilder:rbac:groups=deviceplugin.intel.com,resources=fpgadeviceplugins/status,verbs=get;update;patch
 
 // SetupReconciler creates a new reconciler for FpgaDevicePlugin objects.
-func SetupReconciler(mgr ctrl.Manager) error {
-	c := &controller{scheme: mgr.GetScheme()}
-	return controllers.SetupWithManager(mgr, c, devicepluginv1.GroupVersion.String(), "FpgaDevicePlugin", ownerKey)
+func SetupReconciler(mgr ctrl.Manager, namespace string, withWebhook bool) error {
+	c := &controller{scheme: mgr.GetScheme(), ns: namespace}
+	if err := controllers.SetupWithManager(mgr, c, devicepluginv1.GroupVersion.String(), "FpgaDevicePlugin", ownerKey); err != nil {
+		return err
+	}
+
+	if withWebhook {
+		return (&devicepluginv1.FpgaDevicePlugin{}).SetupWebhookWithManager(mgr)
+	}
+
+	return nil
 }
 
 type controller struct {
 	scheme *runtime.Scheme
+	ns     string
 }
 
 func (c *controller) CreateEmptyObject() client.Object {
@@ -71,7 +80,7 @@ func (c *controller) NewDaemonSet(rawObj client.Object) *apps.DaemonSet {
 	directoryOrCreate := v1.HostPathDirectoryOrCreate
 	return &apps.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace:    devicePlugin.Namespace,
+			Namespace:    c.ns,
 			GenerateName: devicePlugin.Name + "-",
 			Labels: map[string]string{
 				"app": appLabel,
diff --git a/pkg/controllers/gpu/controller.go b/pkg/controllers/gpu/controller.go
@@ -43,13 +43,22 @@ const (
 // +kubebuilder:rbac:groups=deviceplugin.intel.com,resources=gpudeviceplugins/status,verbs=get;update;patch
 
 // SetupReconciler creates a new reconciler for GpuDevicePlugin objects.
-func SetupReconciler(mgr ctrl.Manager) error {
-	c := &controller{scheme: mgr.GetScheme()}
-	return controllers.SetupWithManager(mgr, c, devicepluginv1.GroupVersion.String(), "GpuDevicePlugin", ownerKey)
+func SetupReconciler(mgr ctrl.Manager, namespace string, withWebhook bool) error {
+	c := &controller{scheme: mgr.GetScheme(), ns: namespace}
+	if err := controllers.SetupWithManager(mgr, c, devicepluginv1.GroupVersion.String(), "GpuDevicePlugin", ownerKey); err != nil {
+		return err
+	}
+
+	if withWebhook {
+		return (&devicepluginv1.GpuDevicePlugin{}).SetupWebhookWithManager(mgr)
+	}
+
+	return nil
 }
 
 type controller struct {
 	scheme *runtime.Scheme
+	ns     string
 }
 
 func (c *controller) CreateEmptyObject() client.Object {
@@ -83,7 +92,7 @@ func (c *controller) NewDaemonSet(rawObj client.Object) *apps.DaemonSet {
 	yes := true
 	daemonSet := apps.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace:    devicePlugin.Namespace,
+			Namespace:    c.ns,
 			GenerateName: devicePlugin.Name + "-",
 			Labels: map[string]string{
 				"app": appLabel,
diff --git a/pkg/controllers/qat/controller.go b/pkg/controllers/qat/controller.go
@@ -43,13 +43,22 @@ const (
 // +kubebuilder:rbac:groups=deviceplugin.intel.com,resources=qatdeviceplugins/status,verbs=get;update;patch
 
 // SetupReconciler creates a new reconciler for QatDevicePlugin objects.
-func SetupReconciler(mgr ctrl.Manager) error {
-	c := &controller{scheme: mgr.GetScheme()}
-	return controllers.SetupWithManager(mgr, c, devicepluginv1.GroupVersion.String(), "QatDevicePlugin", ownerKey)
+func SetupReconciler(mgr ctrl.Manager, namespace string, withWebhook bool) error {
+	c := &controller{scheme: mgr.GetScheme(), ns: namespace}
+	if err := controllers.SetupWithManager(mgr, c, devicepluginv1.GroupVersion.String(), "QatDevicePlugin", ownerKey); err != nil {
+		return err
+	}
+
+	if withWebhook {
+		return (&devicepluginv1.QatDevicePlugin{}).SetupWebhookWithManager(mgr)
+	}
+
+	return nil
 }
 
 type controller struct {
 	scheme *runtime.Scheme
+	ns     string
 }
 
 func (c *controller) CreateEmptyObject() client.Object {
@@ -70,7 +79,7 @@ func (c *controller) NewDaemonSet(rawObj client.Object) *apps.DaemonSet {
 	yes := true
 	return &apps.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace:    devicePlugin.Namespace,
+			Namespace:    c.ns,
 			GenerateName: devicePlugin.Name + "-",
 			Labels: map[string]string{
 				"app": appLabel,
diff --git a/pkg/controllers/reconciler.go b/pkg/controllers/reconciler.go
@@ -86,7 +86,7 @@ type reconciler struct {
 
 // Reconcile reconciles a device plugin object.
 func (r *reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	log := log.FromContext(ctx).WithValues(r.pluginKind, req.NamespacedName)
+	log := log.FromContext(ctx)
 
 	if err := r.updateBookKeeper(ctx); err != nil {
 		log.Error(err, "unable to total count of device plugins")
@@ -95,7 +95,7 @@ func (r *reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 
 	// Fetch the plugin's DaemonSet.
 	var childDaemonSets apps.DaemonSetList
-	if err := r.List(ctx, &childDaemonSets, client.InNamespace(req.Namespace), client.MatchingFields{r.ownerKey: req.Name}); err != nil {
+	if err := r.List(ctx, &childDaemonSets, client.MatchingFields{r.ownerKey: req.Name}); err != nil {
 		log.Error(err, "unable to list child DaemonSets")
 		return ctrl.Result{}, err
 	}
diff --git a/pkg/controllers/sgx/controller.go b/pkg/controllers/sgx/controller.go
diff --git a/test/envtest/dsadeviceplugin_controller_test.go b/test/envtest/dsadeviceplugin_controller_test.go
diff --git a/test/envtest/fpgadeviceplugin_controller_test.go b/test/envtest/fpgadeviceplugin_controller_test.go
diff --git a/test/envtest/gpudeviceplugin_controller_test.go b/test/envtest/gpudeviceplugin_controller_test.go
diff --git a/test/envtest/qatdeviceplugin_controller_test.go b/test/envtest/qatdeviceplugin_controller_test.go
diff --git a/test/envtest/sgxdeviceplugin_controller_test.go b/test/envtest/sgxdeviceplugin_controller_test.go
diff --git a/test/envtest/suite_test.go b/test/envtest/suite_test.go

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ type DsaDevicePluginStatus struct {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`// +kubebuilder:object:root=true`
	`66`	`+// +kubebuilder:resource:path=dsadeviceplugins,scope=Cluster`
`66`	`67`	`// +kubebuilder:subresource:status`
`67`	`68`	// +kubebuilder:printcolumn:name="Desired",type=integer,JSONPath=`.status.desiredNumberScheduled`
`68`	`69`	// +kubebuilder:printcolumn:name="Ready",type=integer,JSONPath=`.status.numberReady`