fixed ut and e2e to adopt naming change

capri-xiyue · capri-xiyue · commit 118d9239d4e1 · 2025-08-11T16:39:15.000-07:00
diff --git a/client-go/applyconfiguration/api/v1/port.go b/client-go/applyconfiguration/api/v1/port.go
diff --git a/config/charts/inferencepool/templates/inferencepool.yaml b/config/charts/inferencepool/templates/inferencepool.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- include "gateway-api-inference-extension.labels" . | nindent 4 }}
 spec:
   targetPorts:
-    - portNumber: {{ .Values.inferencePool.targetPortNumber }}
+    - number: {{ .Values.inferencePool.targetPortNumber }}
   selector:
     {{- if .Values.inferencePool.modelServers.matchLabels }}
     {{- range $key, $value := .Values.inferencePool.modelServers.matchLabels }}
diff --git a/config/crd/bases/inference.networking.k8s.io_inferencepools.yaml b/config/crd/bases/inference.networking.k8s.io_inferencepools.yaml
@@ -126,7 +126,7 @@ spec:
                   model server Pods.
                 items:
                   properties:
-                    portNumber:
+                    number:
                       description: |-
                         PortNumber defines the port number to access the selected model server Pods.
                         The number must be in the range 1 to 65535.
@@ -135,7 +135,7 @@ spec:
                       minimum: 1
                       type: integer
                   required:
-                  - portNumber
+                  - number
                   type: object
                 maxItems: 1
                 minItems: 1
diff --git a/config/manifests/inferencepool-resources.yaml b/config/manifests/inferencepool-resources.yaml
@@ -9,7 +9,7 @@ metadata:
   name: vllm-llama3-8b-instruct
 spec:
   targetPorts:
-    - portNumber: 8000
+    - number: 8000
   selector:
     app: vllm-llama3-8b-instruct
   extensionRef:
diff --git a/conformance/resources/base.yaml b/conformance/resources/base.yaml
@@ -155,7 +155,7 @@ spec:
   selector:
     app: primary-inference-model-server
   targetPorts:
-    - portNumber: 3000
+    - number: 3000
   extensionRef:
     name: primary-endpoint-picker-svc
 ---
@@ -249,7 +249,7 @@ spec:
   selector:
     app: secondary-inference-model-server
   targetPorts:
-    - portNumber: 3000
+    - number: 3000
   extensionRef:
     name: secondary-endpoint-picker-svc
     failureMode: FailOpen
diff --git a/pkg/epp/backend/metrics/pod_metrics.go b/pkg/epp/backend/metrics/pod_metrics.go
@@ -119,7 +119,7 @@ func (pm *podMetrics) refreshMetrics() error {
 	if len(pool.Spec.TargetPorts) != 1 {
 		return fmt.Errorf("expected 1 target port, got %d", len(pool.Spec.TargetPorts))
 	}
-	updated, err := pm.pmc.FetchMetrics(ctx, pm.GetPod(), pm.GetMetrics(), pool.Spec.TargetPorts[0].PortNumber)
+	updated, err := pm.pmc.FetchMetrics(ctx, pm.GetPod(), pm.GetMetrics(), pool.Spec.TargetPorts[0].Number)
 	if err != nil {
 		pm.logger.V(logutil.TRACE).Info("Failed to refreshed metrics:", "err", err)
 	}
diff --git a/pkg/epp/backend/metrics/pod_metrics_test.go b/pkg/epp/backend/metrics/pod_metrics_test.go
@@ -88,7 +88,7 @@ func TestMetricsRefresh(t *testing.T) {
 type fakeDataStore struct{}
 
 func (f *fakeDataStore) PoolGet() (*v1.InferencePool, error) {
-	return &v1.InferencePool{Spec: v1.InferencePoolSpec{TargetPorts: []v1.Port{{PortNumber: 8000}}}}, nil
+	return &v1.InferencePool{Spec: v1.InferencePoolSpec{TargetPorts: []v1.Port{{Number: 8000}}}}, nil
 }
 
 func (f *fakeDataStore) PodList(func(PodMetrics) bool) []PodMetrics {
diff --git a/pkg/epp/controller/inferencepool_reconciler_test.go b/pkg/epp/controller/inferencepool_reconciler_test.go
@@ -143,7 +143,7 @@ func TestInferencePoolReconciler(t *testing.T) {
 	if err := fakeClient.Get(ctx, req.NamespacedName, newPool1); err != nil {
 		t.Errorf("Unexpected pool get error: %v", err)
 	}
-	newPool1.Spec.TargetPorts = []v1.Port{{PortNumber: 9090}}
+	newPool1.Spec.TargetPorts = []v1.Port{{Number: 9090}}
 	if err := fakeClient.Update(ctx, newPool1, &client.UpdateOptions{}); err != nil {
 		t.Errorf("Unexpected pool update error: %v", err)
 	}
diff --git a/pkg/epp/controller/pod_reconciler_test.go b/pkg/epp/controller/pod_reconciler_test.go
@@ -61,7 +61,7 @@ func TestPodReconciler(t *testing.T) {
 			existingPods: []*corev1.Pod{basePod1, basePod2},
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
-					TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
+					TargetPorts: []v1.Port{{Number: int32(8000)}},
 					Selector: map[v1.LabelKey]v1.LabelValue{
 						"some-key": "some-val",
 					},
@@ -77,7 +77,7 @@ func TestPodReconciler(t *testing.T) {
 			existingPods: []*corev1.Pod{basePod1, basePod2},
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
-					TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
+					TargetPorts: []v1.Port{{Number: int32(8000)}},
 					Selector: map[v1.LabelKey]v1.LabelValue{
 						"some-key": "some-val",
 					},
@@ -93,7 +93,7 @@ func TestPodReconciler(t *testing.T) {
 			existingPods: []*corev1.Pod{basePod1, basePod2},
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
-					TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
+					TargetPorts: []v1.Port{{Number: int32(8000)}},
 					Selector: map[v1.LabelKey]v1.LabelValue{
 						"some-key": "some-val",
 					},
@@ -110,7 +110,7 @@ func TestPodReconciler(t *testing.T) {
 			existingPods: []*corev1.Pod{basePod1, basePod2},
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
-					TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
+					TargetPorts: []v1.Port{{Number: int32(8000)}},
 					Selector: map[v1.LabelKey]v1.LabelValue{
 						"some-key": "some-val",
 					},
@@ -124,7 +124,7 @@ func TestPodReconciler(t *testing.T) {
 			existingPods: []*corev1.Pod{basePod1, basePod2},
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
-					TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
+					TargetPorts: []v1.Port{{Number: int32(8000)}},
 					Selector: map[v1.LabelKey]v1.LabelValue{
 						"some-key": "some-val",
 					},
@@ -139,7 +139,7 @@ func TestPodReconciler(t *testing.T) {
 			existingPods: []*corev1.Pod{basePod1, basePod2},
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
-					TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
+					TargetPorts: []v1.Port{{Number: int32(8000)}},
 					Selector: map[v1.LabelKey]v1.LabelValue{
 						"some-key": "some-val",
 					},
@@ -155,7 +155,7 @@ func TestPodReconciler(t *testing.T) {
 			existingPods: []*corev1.Pod{basePod1, basePod2},
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
-					TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
+					TargetPorts: []v1.Port{{Number: int32(8000)}},
 					Selector: map[v1.LabelKey]v1.LabelValue{
 						"some-key": "some-val",
 					},
diff --git a/pkg/epp/datastore/datastore_test.go b/pkg/epp/datastore/datastore_test.go
@@ -245,7 +245,7 @@ var (
 	pod2NamespacedName = types.NamespacedName{Name: pod2.Name, Namespace: pod2.Namespace}
 	inferencePool      = &v1.InferencePool{
 		Spec: v1.InferencePoolSpec{
-			TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
+			TargetPorts: []v1.Port{{Number: int32(8000)}},
 		},
 	}
 )
diff --git a/pkg/epp/handlers/request.go b/pkg/epp/handlers/request.go
@@ -49,7 +49,7 @@ func (s *StreamingServer) HandleRequestHeaders(reqCtx *RequestContext, req *extP
 		if len(pool.Spec.TargetPorts) != 1 {
 			return fmt.Errorf("expected 1 target port, got %d", len(pool.Spec.TargetPorts))
 		}
-		reqCtx.TargetEndpoint = pod.Address + ":" + strconv.Itoa(int(pool.Spec.TargetPorts[0].PortNumber))
+		reqCtx.TargetEndpoint = pod.Address + ":" + strconv.Itoa(int(pool.Spec.TargetPorts[0].Number))
 		reqCtx.RequestSize = 0
 		reqCtx.reqHeaderResp = s.generateRequestHeaderResponse(reqCtx)
 		return nil
diff --git a/pkg/epp/metrics/collectors/inference_pool_test.go b/pkg/epp/metrics/collectors/inference_pool_test.go
@@ -80,7 +80,7 @@ func TestMetricsCollected(t *testing.T) {
 			Name: "test-pool",
 		},
 		Spec: v1.InferencePoolSpec{
-			TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
+			TargetPorts: []v1.Port{{Number: int32(8000)}},
 		},
 	}
 	_ = ds.PoolSet(context.Background(), fakeClient, inferencePool)
diff --git a/pkg/epp/requestcontrol/director.go b/pkg/epp/requestcontrol/director.go
@@ -245,7 +245,7 @@ func (d *Director) prepareRequest(ctx context.Context, reqCtx *handlers.RequestC
 	if len(pool.Spec.TargetPorts) != 1 {
 		return reqCtx, errutil.Error{Code: errutil.BadRequest, Msg: "targetPorts should have length 1"}
 	}
-	targetPort := int(pool.Spec.TargetPorts[0].PortNumber)
+	targetPort := int(pool.Spec.TargetPorts[0].Number)
 	targetEndpoints := []string{}
 
 	for _, pod := range result.ProfileResults[result.PrimaryProfileName].TargetPods {
diff --git a/pkg/epp/requestcontrol/director_test.go b/pkg/epp/requestcontrol/director_test.go
@@ -101,7 +101,7 @@ func TestDirector_HandleRequest(t *testing.T) {
 	pool := &v1.InferencePool{
 		ObjectMeta: metav1.ObjectMeta{Name: "test-pool", Namespace: "default"},
 		Spec: v1.InferencePoolSpec{
-			TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
+			TargetPorts: []v1.Port{{Number: int32(8000)}},
 			Selector: map[v1.LabelKey]v1.LabelValue{
 				"app": "inference",
 			},
diff --git a/pkg/epp/util/testing/wrappers.go b/pkg/epp/util/testing/wrappers.go
@@ -199,7 +199,7 @@ func (m *InferencePoolWrapper) Selector(selector map[string]string) *InferencePo
 }
 
 func (m *InferencePoolWrapper) TargetPorts(p int32) *InferencePoolWrapper {
-	m.Spec.TargetPorts = []v1.Port{{PortNumber: p}}
+	m.Spec.TargetPorts = []v1.Port{{Number: p}}
 	return m
 }
 
diff --git a/site-src/api-types/inferencepool.md b/site-src/api-types/inferencepool.md
@@ -34,7 +34,7 @@ metadata:
   name: vllm-llama3-8b-instruct
 spec:
   targetPorts:
-    - portNumber: 8000
+    - number: 8000
   selector:
     app: vllm-llama3-8b-instruct
   extensionRef:
diff --git a/site-src/guides/implementers.md b/site-src/guides/implementers.md
@@ -48,7 +48,7 @@ metadata:
   name: vllm-llama3-8b-instruct
 spec:
   targetPorts:
-    - portNumber: 8000
+    - number: 8000
   selector:
     app: vllm-llama3-8b-instruct
   extensionRef:
diff --git a/test/testdata/inferencepool-e2e.yaml b/test/testdata/inferencepool-e2e.yaml
@@ -5,7 +5,7 @@ metadata:
   name: vllm-llama3-8b-instruct
 spec:
   targetPorts:
-    - portNumber: 8000
+    - number: 8000
   selector:
     app: vllm-llama3-8b-instruct
   extensionRef:
diff --git a/test/testdata/inferencepool-with-model-hermetic.yaml b/test/testdata/inferencepool-with-model-hermetic.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: default
 spec:
   targetPorts:
-    - portNumber: 8000
+    - number: 8000
   selector:
     app: vllm-llama3-8b-instruct-pool
   extensionRef:
diff --git a/test/utils/server.go b/test/utils/server.go
@@ -71,7 +71,7 @@ func PrepareForTestStreamingServer(objectives []*v1alpha2.InferenceObjective, po
 		WithObjects(initObjs...).
 		Build()
 	pool := testutil.MakeInferencePool(poolName).Namespace(namespace).ObjRef()
-	pool.Spec.TargetPorts = []v1.Port{{PortNumber: poolPort}}
+	pool.Spec.TargetPorts = []v1.Port{{Number: poolPort}}
 	_ = ds.PoolSet(context.Background(), fakeClient, pool)
 
 	return ctx, cancel, ds, pmc

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func (pm *podMetrics) refreshMetrics() error {`
`119`	`119`	`if len(pool.Spec.TargetPorts) != 1 {`
`120`	`120`	`return fmt.Errorf("expected 1 target port, got %d", len(pool.Spec.TargetPorts))`
`121`	`121`	`}`
`122`		`- updated, err := pm.pmc.FetchMetrics(ctx, pm.GetPod(), pm.GetMetrics(), pool.Spec.TargetPorts[0].PortNumber)`
	`122`	`+ updated, err := pm.pmc.FetchMetrics(ctx, pm.GetPod(), pm.GetMetrics(), pool.Spec.TargetPorts[0].Number)`
`123`	`123`	`if err != nil {`
`124`	`124`	`pm.logger.V(logutil.TRACE).Info("Failed to refreshed metrics:", "err", err)`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func TestMetricsRefresh(t *testing.T) {`
`88`	`88`	`type fakeDataStore struct{}`
`89`	`89`
`90`	`90`	`func (f fakeDataStore) PoolGet() (v1.InferencePool, error) {`
`91`		`- return &v1.InferencePool{Spec: v1.InferencePoolSpec{TargetPorts: []v1.Port{{PortNumber: 8000}}}}, nil`
	`91`	`+ return &v1.InferencePool{Spec: v1.InferencePoolSpec{TargetPorts: []v1.Port{{Number: 8000}}}}, nil`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`func (f *fakeDataStore) PodList(func(PodMetrics) bool) []PodMetrics {`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func TestInferencePoolReconciler(t *testing.T) {`
`143`	`143`	`if err := fakeClient.Get(ctx, req.NamespacedName, newPool1); err != nil {`
`144`	`144`	`t.Errorf("Unexpected pool get error: %v", err)`
`145`	`145`	`}`
`146`		`- newPool1.Spec.TargetPorts = []v1.Port{{PortNumber: 9090}}`
	`146`	`+ newPool1.Spec.TargetPorts = []v1.Port{{Number: 9090}}`
`147`	`147`	`if err := fakeClient.Update(ctx, newPool1, &client.UpdateOptions{}); err != nil {`
`148`	`148`	`t.Errorf("Unexpected pool update error: %v", err)`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ var (`
`245`	`245`	`pod2NamespacedName = types.NamespacedName{Name: pod2.Name, Namespace: pod2.Namespace}`
`246`	`246`	`inferencePool = &v1.InferencePool{`
`247`	`247`	`Spec: v1.InferencePoolSpec{`
`248`		`- TargetPorts: []v1.Port{{PortNumber: int32(8000)}},`
	`248`	`+ TargetPorts: []v1.Port{{Number: int32(8000)}},`
`249`	`249`	`},`
`250`	`250`	`}`
`251`	`251`	`)`