Upgrade the inferencePool selector to a struct from a map.

Author: zetxqx

api/v1/inferencepool_types.go

@@ -51,15 +51,16 @@ type InferencePoolList struct {
 
 // InferencePoolSpec defines the desired state of InferencePool
 type InferencePoolSpec struct {
-	// Selector defines a map of labels to watch model server Pods
-	// that should be included in the InferencePool.
-	// In some cases, implementations may translate this field to a Service selector, so this matches the simple
-	// map used for Service selectors instead of the full Kubernetes LabelSelector type.
-	// If specified, it will be applied to match the model server pods in the same namespace as the InferencePool.
-	// Cross namesoace selector is not supported.
+	// Selector determines which Pods are members of this inference pool.
+	// It matches Pods by their labels only within the same namespace; cross-namespace
+	// selection is not supported.
+	//
+	// The structure of this LabelSelector is intentionally simple to be compatible
+	// with Kubernetes Service selectors, as some implementations may translate
+	// this configuration into a Service resource.
 	//
 	// +kubebuilder:validation:Required
-	Selector map[LabelKey]LabelValue `json:"selector"`
+	Selector LabelSelector `json:"selector"`
 
 	// TargetPortNumber defines the port number to access the selected model server Pods.
 	// The number must be in the range 1 to 65535.

api/v1/shared_types.go

@@ -127,3 +127,13 @@ type LabelKey string
 // +kubebuilder:validation:MaxLength=63
 // +kubebuilder:validation:Pattern=`^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$`
 type LabelValue string
+
+// LabelSelector defines a query for resources based on their labels.
+// This simplified version uses only the matchLabels field.
+type LabelSelector struct {
+	// matchLabels contains a set of required {key,value} pairs.
+	// An object must match every label in this map to be selected.
+	// The matching logic is an AND operation on all entries.
+	// +optional
+	MatchLabels map[LabelKey]LabelValue `json:"matchLabels,omitempty" protobuf:"bytes,1,rep,name=matchLabels"`
+}

api/v1/zz_generated.deepcopy.go

@@ -0,0 +1,159 @@
+/*
+Copyright 2025 The Kubernetes 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 v1alpha2
+
+import (
+	"fmt"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	v1 "sigs.k8s.io/gateway-api-inference-extension/api/v1"
+)
+
+// ConvertTo converts this InferencePool (v1alpha2) to the v1 version.
+func (src *InferencePool) ConvertTo() (*v1.InferencePool, error) {
+	if src == nil {
+		return nil, nil
+	}
+
+	v1Status, err := converStatusToV1(src.Status)
+	if err != nil {
+		return nil, err
+	}
+	dst := &v1.InferencePool{
+		TypeMeta:   src.TypeMeta,
+		ObjectMeta: src.ObjectMeta,
+		Spec: v1.InferencePoolSpec{
+			TargetPortNumber:     src.Spec.TargetPortNumber,
+			EndpointPickerConfig: convertEndpointPickerConfigToV1(&src.Spec.EndpointPickerConfig),
+		},
+		Status: *v1Status,
+	}
+	if src.Spec.Selector != nil {
+		dst.Spec.Selector.MatchLabels = make(map[v1.LabelKey]v1.LabelValue, len(src.Spec.Selector))
+		for k, v := range src.Spec.Selector {
+			dst.Spec.Selector.MatchLabels[v1.LabelKey(k)] = v1.LabelValue(v)
+		}
+	}
+	return dst, nil
+}
+
+// ConvertFrom converts from the v1 version to this version (v1alpha2).
+func ConvertFrom(src *v1.InferencePool) (*InferencePool, error) {
+	if src == nil {
+		return nil, nil
+	}
+
+	status, err := converStatusFromV1(src.Status)
+	if err != nil {
+		return nil, err
+	}
+	dst := &InferencePool{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "InferencePool",
+			APIVersion: "inference.networking.x-k8s.io/v1alpha2",
+		},
+		ObjectMeta: src.ObjectMeta,
+		Spec: InferencePoolSpec{
+			TargetPortNumber:     src.Spec.TargetPortNumber,
+			EndpointPickerConfig: convertEndpointPickerConfigFromV1(&src.Spec.EndpointPickerConfig),
+		},
+		Status: *status,
+	}
+
+	if src.Spec.Selector.MatchLabels != nil {
+		dst.Spec.Selector = make(map[LabelKey]LabelValue, len(src.Spec.Selector.MatchLabels))
+		for k, v := range src.Spec.Selector.MatchLabels {
+			dst.Spec.Selector[LabelKey(k)] = LabelValue(v)
+		}
+	}
+
+	return dst, nil
+}
+
+func converStatusToV1(src InferencePoolStatus) (v1Status *v1.InferencePoolStatus, err error) {
+	u, err := toUnstructured(&src)
+	if err != nil {
+		return nil, err
+	}
+	return convert[v1.InferencePoolStatus](u)
+}
+
+func converStatusFromV1(src v1.InferencePoolStatus) (v1Status *InferencePoolStatus, err error) {
+	u, err := toUnstructured(&src)
+	if err != nil {
+		return nil, err
+	}
+	return convert[InferencePoolStatus](u)
+}
+
+func convertEndpointPickerConfigToV1(src *EndpointPickerConfig) v1.EndpointPickerConfig {
+	if src == nil || src.ExtensionRef == nil {
+		return v1.EndpointPickerConfig{}
+	}
+	srcRef := src.ExtensionRef
+	return v1.EndpointPickerConfig{
+		ExtensionRef: &v1.Extension{
+			ExtensionReference: v1.ExtensionReference{
+				Group:      (*v1.Group)(srcRef.Group),
+				Kind:       (*v1.Kind)(srcRef.Kind),
+				Name:       v1.ObjectName(srcRef.Name),
+				PortNumber: (*v1.PortNumber)(srcRef.PortNumber),
+			},
+			ExtensionConnection: v1.ExtensionConnection{
+				FailureMode: (*v1.ExtensionFailureMode)(srcRef.FailureMode),
+			},
+		},
+	}
+}
+
+func convertEndpointPickerConfigFromV1(src *v1.EndpointPickerConfig) EndpointPickerConfig {
+	if src == nil || src.ExtensionRef == nil {
+		return EndpointPickerConfig{}
+	}
+	srcRef := src.ExtensionRef
+	return EndpointPickerConfig{
+		ExtensionRef: &Extension{
+			ExtensionReference: ExtensionReference{
+				Group:      (*Group)(srcRef.Group),
+				Kind:       (*Kind)(srcRef.Kind),
+				Name:       ObjectName(srcRef.Name),
+				PortNumber: (*PortNumber)(srcRef.PortNumber),
+			},
+			ExtensionConnection: ExtensionConnection{
+				FailureMode: (*ExtensionFailureMode)(srcRef.FailureMode),
+			},
+		},
+	}
+}
+
+func toUnstructured(obj any) (*unstructured.Unstructured, error) {
+	u, err := runtime.DefaultUnstructuredConverter.ToUnstructured(obj)
+	if err != nil {
+		return nil, err
+	}
+	return &unstructured.Unstructured{Object: u}, nil
+}
+
+func convert[T any](u *unstructured.Unstructured) (*T, error) {
+	var res T
+	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, &res); err != nil {
+		return nil, fmt.Errorf("error converting unstructured to T: %v", err)
+	}
+	return &res, nil
+}