Skip to content

Commit 87e1035

Browse files
capri-xiyuecapri-xiyue
committed
fixed ut and e2e to adopt naming change
1 parent 41a6f85 commit 87e1035

File tree

20 files changed

+33
-31
lines changed

20 files changed

+33
-31
lines changed

‎client-go/applyconfiguration/api/v1/port.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/charts/inferencepool/templates/inferencepool.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
{{- include "gateway-api-inference-extension.labels" . | nindent 4 }}
99
spec:
1010
targetPorts:
11-
- portNumber: {{ .Values.inferencePool.targetPortNumber }}
11+
- number: {{ .Values.inferencePool.targetPortNumber }}
1212
selector:
1313
matchLabels:
1414
{{- if .Values.inferencePool.modelServers.matchLabels }}

‎config/crd/bases/inference.networking.k8s.io_inferencepools.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ spec:
136136
model server Pods.
137137
items:
138138
properties:
139-
portNumber:
139+
number:
140140
description: |-
141141
PortNumber defines the port number to access the selected model server Pods.
142142
The number must be in the range 1 to 65535.
@@ -145,7 +145,7 @@ spec:
145145
minimum: 1
146146
type: integer
147147
required:
148-
- portNumber
148+
- number
149149
type: object
150150
maxItems: 1
151151
minItems: 1

‎config/manifests/inferencepool-resources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
name: vllm-llama3-8b-instruct
1010
spec:
1111
targetPorts:
12-
- portNumber: 8000
12+
- number: 8000
1313
selector:
1414
matchLabels:
1515
app: vllm-llama3-8b-instruct

‎conformance/resources/base.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ spec:
159159
matchLabels:
160160
app: primary-inference-model-server
161161
targetPortNumber: 3000
162+
- number: 3000
162163
extensionRef:
163164
name: primary-endpoint-picker-svc
164165
---
@@ -251,7 +252,8 @@ metadata:
251252
spec:
252253
selector:
253254
app: secondary-inference-model-server
254-
targetPortNumber: 3000
255+
targetPorts:
256+
- portNumber: 3000
255257
extensionRef:
256258
name: secondary-endpoint-picker-svc
257259
failureMode: FailOpen

‎pkg/epp/backend/metrics/pod_metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (pm *podMetrics) refreshMetrics() error {
119119
if len(pool.Spec.TargetPorts) != 1 {
120120
return fmt.Errorf("expected 1 target port, got %d", len(pool.Spec.TargetPorts))
121121
}
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)
123123
if err != nil {
124124
pm.logger.V(logutil.TRACE).Info("Failed to refreshed metrics:", "err", err)
125125
}

‎pkg/epp/backend/metrics/pod_metrics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestMetricsRefresh(t *testing.T) {
8888
type fakeDataStore struct{}
8989

9090
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
9292
}
9393

9494
func (f *fakeDataStore) PodList(func(PodMetrics) bool) []PodMetrics {

‎pkg/epp/controller/inferencepool_reconciler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func TestInferencePoolReconciler(t *testing.T) {
147147
if err := fakeClient.Get(ctx, req.NamespacedName, newPool1); err != nil {
148148
t.Errorf("Unexpected pool get error: %v", err)
149149
}
150-
newPool1.Spec.TargetPorts = []v1.Port{{PortNumber: 9090}}
150+
newPool1.Spec.TargetPorts = []v1.Port{{Number: 9090}}
151151
if err := fakeClient.Update(ctx, newPool1, &client.UpdateOptions{}); err != nil {
152152
t.Errorf("Unexpected pool update error: %v", err)
153153
}

‎pkg/epp/controller/pod_reconciler_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestPodReconciler(t *testing.T) {
6161
existingPods: []*corev1.Pod{basePod1, basePod2},
6262
pool: &v1.InferencePool{
6363
Spec: v1.InferencePoolSpec{
64-
TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
64+
TargetPorts: []v1.Port{{Number: int32(8000)}},
6565
Selector: map[v1.LabelKey]v1.LabelValue{
6666
"some-key": "some-val",
6767
TargetPortNumber: int32(8000),
@@ -82,7 +82,7 @@ func TestPodReconciler(t *testing.T) {
8282
existingPods: []*corev1.Pod{basePod1, basePod2},
8383
pool: &v1.InferencePool{
8484
Spec: v1.InferencePoolSpec{
85-
TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
85+
TargetPorts: []v1.Port{{Number: int32(8000)}},
8686
Selector: map[v1.LabelKey]v1.LabelValue{
8787
"some-key": "some-val",
8888
TargetPortNumber: int32(8000),
@@ -103,7 +103,7 @@ func TestPodReconciler(t *testing.T) {
103103
existingPods: []*corev1.Pod{basePod1, basePod2},
104104
pool: &v1.InferencePool{
105105
Spec: v1.InferencePoolSpec{
106-
TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
106+
TargetPorts: []v1.Port{{Number: int32(8000)}},
107107
Selector: map[v1.LabelKey]v1.LabelValue{
108108
"some-key": "some-val",
109109
TargetPortNumber: int32(8000),
@@ -125,7 +125,7 @@ func TestPodReconciler(t *testing.T) {
125125
existingPods: []*corev1.Pod{basePod1, basePod2},
126126
pool: &v1.InferencePool{
127127
Spec: v1.InferencePoolSpec{
128-
TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
128+
TargetPorts: []v1.Port{{Number: int32(8000)}},
129129
Selector: map[v1.LabelKey]v1.LabelValue{
130130
"some-key": "some-val",
131131
TargetPortNumber: int32(8000),
@@ -144,7 +144,7 @@ func TestPodReconciler(t *testing.T) {
144144
existingPods: []*corev1.Pod{basePod1, basePod2},
145145
pool: &v1.InferencePool{
146146
Spec: v1.InferencePoolSpec{
147-
TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
147+
TargetPorts: []v1.Port{{Number: int32(8000)}},
148148
Selector: map[v1.LabelKey]v1.LabelValue{
149149
"some-key": "some-val",
150150
TargetPortNumber: int32(8000),
@@ -164,7 +164,7 @@ func TestPodReconciler(t *testing.T) {
164164
existingPods: []*corev1.Pod{basePod1, basePod2},
165165
pool: &v1.InferencePool{
166166
Spec: v1.InferencePoolSpec{
167-
TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
167+
TargetPorts: []v1.Port{{Number: int32(8000)}},
168168
Selector: map[v1.LabelKey]v1.LabelValue{
169169
"some-key": "some-val",
170170
TargetPortNumber: int32(8000),
@@ -185,7 +185,7 @@ func TestPodReconciler(t *testing.T) {
185185
existingPods: []*corev1.Pod{basePod1, basePod2},
186186
pool: &v1.InferencePool{
187187
Spec: v1.InferencePoolSpec{
188-
TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
188+
TargetPorts: []v1.Port{{Number: int32(8000)}},
189189
Selector: map[v1.LabelKey]v1.LabelValue{
190190
"some-key": "some-val",
191191
TargetPortNumber: int32(8000),

‎pkg/epp/datastore/datastore_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ var (
245245
pod2NamespacedName = types.NamespacedName{Name: pod2.Name, Namespace: pod2.Namespace}
246246
inferencePool = &v1.InferencePool{
247247
Spec: v1.InferencePoolSpec{
248-
TargetPorts: []v1.Port{{PortNumber: int32(8000)}},
248+
TargetPorts: []v1.Port{{Number: int32(8000)}},
249249
},
250250
}
251251
)

0 commit comments

Comments
 (0)