Merge pull request #708 from ellistarn/nn

fix: Use controllerruntime's namespaced name correctly

Author: k8s-ci-robot

pkg/controller/instance/controller.go

@@ -17,7 +17,6 @@ package instance
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -109,11 +108,9 @@ func NewController(
 
 // Reconcile is a handler function that reconciles the instance and its sub-resources.
 func (c *Controller) Reconcile(ctx context.Context, req ctrl.Request) error {
-	namespace, name := getNamespaceName(req)
+	log := c.log.WithValues("namespace", req.Namespace, "name", req.Name)
 
-	log := c.log.WithValues("namespace", namespace, "name", name)
-
-	instance, err := c.clientSet.Dynamic().Resource(c.gvr).Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
+	instance, err := c.clientSet.Dynamic().Resource(c.gvr).Namespace(req.Namespace).Get(ctx, req.Name, metav1.GetOptions{})
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			log.Info("Instance not found, it may have been deleted")
@@ -152,14 +149,3 @@ func (c *Controller) Reconcile(ctx context.Context, req ctrl.Request) error {
 	}
 	return instanceGraphReconciler.reconcile(ctx)
 }
-
-// getNamespaceName extracts the namespace and name from the request.
-func getNamespaceName(req ctrl.Request) (string, string) {
-	parts := strings.Split(req.Name, "/")
-	name := parts[len(parts)-1]
-	namespace := parts[0]
-	if namespace == "" {
-		namespace = metav1.NamespaceDefault
-	}
-	return namespace, name
-}

pkg/dynamiccontroller/dynamic_controller.go

@@ -59,6 +59,7 @@ package dynamiccontroller
 import (
 	"context"
 	"fmt"
+	"strings"
 	"sync"
 	"time"
 
@@ -333,7 +334,15 @@ func (dc *DynamicController) syncFunc(ctx context.Context, oi ObjectIdentifiers)
 	if !ok {
 		return fmt.Errorf("invalid handler type for GVR: %s", gvrKey)
 	}
-	err := handlerFunc(ctx, ctrl.Request{NamespacedName: types.NamespacedName{Name: oi.NamespacedKey}})
+
+	nn := types.NamespacedName{}
+	if parts := strings.Split(oi.NamespacedKey, "/"); len(parts) == 1 {
+		nn.Name = parts[0]
+	} else {
+		nn.Namespace = parts[0]
+		nn.Name = parts[1]
+	}
+	err := handlerFunc(ctx, ctrl.Request{NamespacedName: nn})
 	if err != nil {
 		handlerErrorsTotal.WithLabelValues(gvrKey).Inc()
 	}