Fix router controllers dropping tombstone delete events

charts/kthena/README.md.gotmpl

@@ -5,8 +5,6 @@
 
 {{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
 
-{{ template "chart.requirementsSection" . }}
-
 {{ template "chart.valuesSection" . }}
 
 

docs/kthena/docs/reference/helm-chart-values.md

@@ -4,13 +4,6 @@ A Helm chart for deploying Kthena
 
 ![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
-## Requirements
-
-| Repository | Name | Version |
-|------------|------|---------|
-|  | networking | 1.0.0 |
-|  | workload | 1.0.0 |
-
 ## Values
 
 | Key | Type | Default | Description |

pkg/kthena-router/controller/gateway_controller.go

@@ -164,7 +164,7 @@ func (c *GatewayController) syncHandler(key string) error {
 }
 
 func (c *GatewayController) enqueueGateway(obj interface{}) {
-	key, err := cache.MetaNamespaceKeyFunc(obj)
+	key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 	if err != nil {
 		utilruntime.HandleError(err)
 		return

pkg/kthena-router/controller/gateway_controller_test.go

@@ -0,0 +1,86 @@
+/*
+Copyright The Volcano 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 controller
+
+import (
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/util/workqueue"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	"github.com/volcano-sh/kthena/pkg/kthena-router/datastore"
+)
+
+func TestEnqueueGateway(t *testing.T) {
+	tests := []struct {
+		name        string
+		obj         interface{}
+		expectedKey string
+	}{
+		{
+			name: "normal Gateway object",
+			obj: &gatewayv1.Gateway{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-gateway",
+					Namespace: "default",
+				},
+			},
+			expectedKey: "default/test-gateway",
+		},
+		{
+			name: "tombstone with DeletedFinalStateUnknown",
+			obj: cache.DeletedFinalStateUnknown{
+				Key: "default/deleted-gateway",
+				Obj: &gatewayv1.Gateway{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "deleted-gateway",
+						Namespace: "default",
+					},
+				},
+			},
+			expectedKey: "default/deleted-gateway",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			queue := workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[any]())
+			defer queue.ShutDown()
+
+			c := &GatewayController{
+				workqueue: queue,
+				store:     datastore.New(),
+			}
+
+			c.enqueueGateway(tt.obj)
+
+			if queue.Len() != 1 {
+				t.Fatalf("expected 1 item in queue, got %d", queue.Len())
+			}
+
+			item, shutdown := queue.Get()
+			if shutdown {
+				t.Fatal("unexpected queue shutdown")
+			}
+			if item != tt.expectedKey {
+				t.Errorf("expected key %q, got %q", tt.expectedKey, item)
+			}
+		})
+	}
+}

pkg/kthena-router/controller/httproute_controller.go

@@ -169,7 +169,7 @@ func (c *HTTPRouteController) syncHandler(key string) error {
 }
 
 func (c *HTTPRouteController) enqueueHTTPRoute(obj interface{}) {
-	key, err := cache.MetaNamespaceKeyFunc(obj)
+	key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 	if err != nil {
 		utilruntime.HandleError(err)
 		return

pkg/kthena-router/controller/httproute_controller_test.go

@@ -0,0 +1,86 @@
+/*
+Copyright The Volcano 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 controller
+
+import (
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/util/workqueue"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	"github.com/volcano-sh/kthena/pkg/kthena-router/datastore"
+)
+
+func TestEnqueueHTTPRoute(t *testing.T) {
+	tests := []struct {
+		name        string
+		obj         interface{}
+		expectedKey string
+	}{
+		{
+			name: "normal HTTPRoute object",
+			obj: &gatewayv1.HTTPRoute{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-httproute",
+					Namespace: "default",
+				},
+			},
+			expectedKey: "default/test-httproute",
+		},
+		{
+			name: "tombstone with DeletedFinalStateUnknown",
+			obj: cache.DeletedFinalStateUnknown{
+				Key: "default/deleted-httproute",
+				Obj: &gatewayv1.HTTPRoute{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "deleted-httproute",
+						Namespace: "default",
+					},
+				},
+			},
+			expectedKey: "default/deleted-httproute",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			queue := workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[any]())
+			defer queue.ShutDown()
+
+			c := &HTTPRouteController{
+				workqueue: queue,
+				store:     datastore.New(),
+			}
+
+			c.enqueueHTTPRoute(tt.obj)
+
+			if queue.Len() != 1 {
+				t.Fatalf("expected 1 item in queue, got %d", queue.Len())
+			}
+
+			item, shutdown := queue.Get()
+			if shutdown {
+				t.Fatal("unexpected queue shutdown")
+			}
+			if item != tt.expectedKey {
+				t.Errorf("expected key %q, got %q", tt.expectedKey, item)
+			}
+		})
+	}
+}

pkg/kthena-router/controller/inferencepool_controller.go

@@ -155,7 +155,7 @@ func (c *InferencePoolController) syncHandler(key string) error {
 }
 
 func (c *InferencePoolController) enqueueInferencePool(obj interface{}) {
-	key, err := cache.MetaNamespaceKeyFunc(obj)
+	key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 	if err != nil {
 		utilruntime.HandleError(err)
 		return

pkg/kthena-router/controller/inferencepool_controller_test.go

@@ -0,0 +1,86 @@
+/*
+Copyright The Volcano 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 controller
+
+import (
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/util/workqueue"
+	inferencev1 "sigs.k8s.io/gateway-api-inference-extension/api/v1"
+
+	"github.com/volcano-sh/kthena/pkg/kthena-router/datastore"
+)
+
+func TestEnqueueInferencePool(t *testing.T) {
+	tests := []struct {
+		name        string
+		obj         interface{}
+		expectedKey string
+	}{
+		{
+			name: "normal InferencePool object",
+			obj: &inferencev1.InferencePool{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-pool",
+					Namespace: "default",
+				},
+			},
+			expectedKey: "default/test-pool",
+		},
+		{
+			name: "tombstone with DeletedFinalStateUnknown",
+			obj: cache.DeletedFinalStateUnknown{
+				Key: "default/deleted-pool",
+				Obj: &inferencev1.InferencePool{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "deleted-pool",
+						Namespace: "default",
+					},
+				},
+			},
+			expectedKey: "default/deleted-pool",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			queue := workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[any]())
+			defer queue.ShutDown()
+
+			c := &InferencePoolController{
+				workqueue: queue,
+				store:     datastore.New(),
+			}
+
+			c.enqueueInferencePool(tt.obj)
+
+			if queue.Len() != 1 {
+				t.Fatalf("expected 1 item in queue, got %d", queue.Len())
+			}
+
+			item, shutdown := queue.Get()
+			if shutdown {
+				t.Fatal("unexpected queue shutdown")
+			}
+			if item != tt.expectedKey {
+				t.Errorf("expected key %q, got %q", tt.expectedKey, item)
+			}
+		})
+	}
+}

pkg/kthena-router/controller/modelroute_controller.go

@@ -151,7 +151,7 @@ func (c *ModelRouteController) syncHandler(key string) error {
 }
 
 func (c *ModelRouteController) enqueueModelRoute(obj interface{}) {
-	key, err := cache.MetaNamespaceKeyFunc(obj)
+	key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 	if err != nil {
 		utilruntime.HandleError(err)
 		return