fix: set correct namespace for recycled object

Author: poneding

cmd/krb-cli/cmd/get-recycle-items.go

@@ -150,7 +150,7 @@ func runGetRecycleItems(args []string) {
 		t.SetOutputMirror(os.Stdout)
 		t.AppendHeader(table.Row{"Name", "Object Key", "Object APIVersion", "Object Kind", "Age"})
 		for _, obj := range result.Items {
-			t.AppendRow(table.Row{obj.Name, obj.Object.Key().String(), obj.Object.GroupVersion().String(), obj.Object.Kind, duration.HumanDuration(time.Since(obj.CreationTimestamp.Time))}, table.RowConfig{
+			t.AppendRow(table.Row{obj.Name, obj.Object.Key(), obj.Object.GroupVersion().String(), obj.Object.Kind, duration.HumanDuration(time.Since(obj.CreationTimestamp.Time))}, table.RowConfig{
 				AutoMerge: true,
 			})
 		}

cmd/krb-cli/cmd/restore.go

@@ -86,9 +86,9 @@ func runRestore(args []string) {
 		}
 
 		if _, err := kube.DynamicClient().Resource(recycleItem.Object.GroupVersionResource()).Namespace(recycleItem.Object.Namespace).Create(context.Background(), unstructuredObj, metav1.CreateOptions{}); err != nil {
-			tlog.Printf("✗ failed to restore recycled resource object [%s]: %v", recycleItem.Object.Key().String(), err)
+			tlog.Printf("✗ failed to restore recycled resource object [%s]: %v", recycleItem.Object.Key(), err)
 		} else {
-			tlog.Printf("✓ restored recycled resource object [%s: %s] done.", recycleItem.Object.Resource, recycleItem.Object.Key().String())
+			tlog.Printf("✓ restored recycled resource object [%s: %s] done.", recycleItem.Object.Resource, recycleItem.Object.Key())
 			// delete the recycle item after successful restore
 			if err := krbclient.RecycleItem().Delete(context.Background(), recycleItemName, client.DeleteOptions{}); err != nil {
 				tlog.Printf("✗ failed to automatically delete RecycleItem [%s] after restore: %v", recycleItemName, err)

cmd/krb-cli/cmd/view.go

@@ -90,19 +90,19 @@ func runView(args []string) {
 		case "json":
 			objContent, err := recycleItem.Object.IndentedJSON()
 			if err != nil {
-				tlog.Printf("✗ failed to view recycled resource object [%s: %s] from RecycleItem [%s] in JSON format: %s, error: %v", recycleItem.Object.Kind, recycleItem.Object.Key().String(), recycleItem.Name, recycleItem.Name, err)
+				tlog.Printf("✗ failed to view recycled resource object [%s: %s] from RecycleItem [%s] in JSON format: %s, error: %v", recycleItem.Object.Kind, recycleItem.Object.Key(), recycleItem.Name, recycleItem.Name, err)
 				continue
 			}
 			objContents = append(objContents, objContent)
-			// tlog.Printf("✓ recycled resource object [%s: %s] from RecycleItem [%s]: \n%s \n", recycleItem.Object.Kind, recycleItem.Object.Key().String(), recycleItem.Name, objContent)
+			// tlog.Printf("✓ recycled resource object [%s: %s] from RecycleItem [%s]: \n%s \n", recycleItem.Object.Kind, recycleItem.Object.Key(), recycleItem.Name, objContent)
 		default:
 			objContent, err := recycleItem.Object.YAML()
 			if err != nil {
-				tlog.Printf("✗ failed to view recycled resource object [%s: %s] from RecycleItem [%s] in YAML format: %s, error: %v", recycleItem.Object.Kind, recycleItem.Object.Key().String(), recycleItem.Name, recycleItem.Name, err)
+				tlog.Printf("✗ failed to view recycled resource object [%s: %s] from RecycleItem [%s] in YAML format: %s, error: %v", recycleItem.Object.Kind, recycleItem.Object.Key(), recycleItem.Name, recycleItem.Name, err)
 				continue
 			}
 			objContents = append(objContents, objContent)
-			// tlog.Printf("✓ recycled resource object [%s: %s] from RecycleItem [%s]: \n%s \n", recycleItem.Object.Kind, recycleItem.Object.Key().String(), recycleItem.Name, objContent)
+			// tlog.Printf("✓ recycled resource object [%s: %s] from RecycleItem [%s]: \n%s \n", recycleItem.Object.Kind, recycleItem.Object.Key(), recycleItem.Name, objContent)
 		}
 	}
 	tlog.Print(strings.Join(objContents, "\n---\n"))

internal/api/recycle_item_types.go

@@ -24,7 +24,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/rand"
 	"sigs.k8s.io/yaml"
 )
@@ -53,13 +52,9 @@ type RecycleItemList struct {
 }
 
 func NewRecycleItem(recycledObj *RecycledObject) *RecycleItem {
-	gr := metav1.GroupResource{
-		Group:    recycledObj.Group,
-		Resource: recycledObj.Resource,
-	}
 	labels := map[string]string{
 		"krb.ketches.cn/object-name": recycledObj.Name,
-		"krb.ketches.cn/object-gr":   gr.String(),
+		"krb.ketches.cn/object-gr":   recycledObj.GroupResource().String(),
 		"krb.ketches.cn/recycled-at": fmt.Sprintf("%d", metav1.Now().Unix()),
 	}
 	if recycledObj.Namespace != "" {
@@ -72,18 +67,18 @@ func NewRecycleItem(recycledObj *RecycledObject) *RecycleItem {
 			Kind:       RecycleItemKind,
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:   fmt.Sprintf("%s-%s", recycledObj.Name, rand.String(8)),
+			Name:   recycledObj.Name + "-" + rand.String(8),
 			Labels: labels,
 		},
 		Object: *recycledObj,
 	}
 }
 
-func (obj *RecycledObject) Key() types.NamespacedName {
-	return types.NamespacedName{
-		Name:      obj.Name,
-		Namespace: obj.Namespace,
+func (obj *RecycledObject) Key() string {
+	if obj.Namespace == "" {
+		return obj.Name
 	}
+	return obj.Namespace + "/" + obj.Name
 }
 
 func (obj *RecycledObject) GroupVersionKind() schema.GroupVersionKind {

internal/webhook/webhook.go

@@ -27,10 +27,12 @@ import (
 	"github.com/ketches/kube-recycle-bin/internal/api"
 	krbclient "github.com/ketches/kube-recycle-bin/internal/client"
 	"github.com/ketches/kube-recycle-bin/internal/consts"
+	"github.com/ketches/kube-recycle-bin/pkg/kube"
 	"github.com/ketches/kube-recycle-bin/pkg/tlog"
+	"github.com/ketches/kube-recycle-bin/pkg/util"
 	admissionv1 "k8s.io/api/admission/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -78,26 +80,23 @@ func recycleDeleteObjects(w http.ResponseWriter, r *http.Request) {
 	}
 
 	request := review.Request
-	tlog.Infof("» prepare to recycle deleted object: %s - %s", request.Kind.String(), types.NamespacedName{
-		Name:      request.Name,
-		Namespace: request.Namespace,
-	}.String())
 
 	// Create RecycleItem to recycle the deleted object.
-	recycleItem := api.NewRecycleItem(buildRecycledObject(request))
-	if err := retry.OnError(retry.DefaultRetry, k8serrors.IsAlreadyExists, func() error {
-		if err := krbclient.RecycleItem().Create(context.Background(), recycleItem, client.CreateOptions{}); err != nil {
-			return err
+	recycledObj := buildRecycledObject(request)
+	if recycledObj != nil {
+		tlog.Infof("» prepare to recycle deleted object [%s: %s]", request.Kind.Kind, recycledObj.Key())
+		recycleItem := api.NewRecycleItem(recycledObj)
+		if err := retry.OnError(retry.DefaultRetry, k8serrors.IsAlreadyExists, func() error {
+			if err := krbclient.RecycleItem().Create(context.Background(), recycleItem, client.CreateOptions{}); err != nil {
+				return err
+			}
+
+			tlog.Infof("✓ recycle deleted object [%s: %s] done.", recycledObj.Kind, recycledObj.Key())
+
+			return nil
+		}); err != nil {
+			tlog.Errorf("✗ failed to recycle deleted object [%s: %s]: %v", recycledObj.Kind, recycledObj.Key(), err)
 		}
-
-		tlog.Infof("✓ recycle deleted object %s done", types.NamespacedName{
-			Name:      request.Name,
-			Namespace: request.Namespace,
-		}.String())
-
-		return nil
-	}); err != nil {
-		tlog.Errorf("✗ failed to recycle deleted object: %v", err)
 	}
 
 	response(w, review)
@@ -119,12 +118,21 @@ func parseRequest(r *http.Request) (*admissionv1.AdmissionReview, error) {
 
 // buildRecycledObject constructs api.RecycledObject from the request
 func buildRecycledObject(request *admissionv1.AdmissionRequest) *api.RecycledObject {
+	namespaced, err := kube.IsResourceNamespaced(schema.GroupVersionResource{
+		Group:    request.Resource.Group,
+		Version:  request.Resource.Version,
+		Resource: request.Resource.Resource,
+	})
+	if err != nil {
+		tlog.Errorf("✗ failed to check if resource is namespaced: %v", err)
+		return nil
+	}
 	return &api.RecycledObject{
 		Group:     request.Resource.Group,
 		Version:   request.Resource.Version,
 		Resource:  request.Resource.Resource,
 		Kind:      request.Kind.Kind,
-		Namespace: request.Namespace,
+		Namespace: util.If(namespaced, request.Namespace, ""),
 		Name:      request.Name,
 		Raw:       request.OldObject.Raw,
 	}

pkg/kube/gvkr.go

@@ -24,6 +24,7 @@ import (
 	"k8s.io/client-go/restmapper"
 )
 
+// GetAllGroupResources returns all group resources in the cluster.
 func GetAllGroupResources() ([]string, error) {
 	discoveryClient := DiscoveryClient()
 
@@ -146,3 +147,20 @@ func GetPreferredGroupVersionResourceFor(resource string) (*schema.GroupVersionR
 	}
 	return nil, fmt.Errorf("can not find preferred GroupVersionResource for resource %s", resource)
 }
+
+// IsResourceNamespaced checks if the given GroupVersionResource is namespaced.
+func IsResourceNamespaced(gvr schema.GroupVersionResource) (bool, error) {
+	discoveryClient := DiscoveryClient()
+
+	apiResourceList, err := discoveryClient.ServerResourcesForGroupVersion(gvr.GroupVersion().String())
+	if err != nil {
+		return false, err
+	}
+
+	for _, apiResource := range apiResourceList.APIResources {
+		if apiResource.Name == gvr.Resource {
+			return apiResource.Namespaced, nil
+		}
+	}
+	return false, fmt.Errorf("can not assert if resource %s is namespaced", gvr.GroupResource().String())
+}

pkg/util/cond.go

@@ -0,0 +1,24 @@
+/*
+Copyright 2025 The Ketches Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package util
+
+func If(cond bool, a, b string) string {
+	if cond {
+		return a
+	}
+	return b
+}