Skip to content

Commit e0c297c

Browse files
capri-xiyuecapri-xiyue
committed
updated to use alias
1 parent 119d445 commit e0c297c

File tree

10 files changed

+22
-18
lines changed

10 files changed

+22
-18
lines changed

‎api/v1/inferencepool_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ type Port struct {
8282
// +kubebuilder:validation:Minimum=1
8383
// +kubebuilder:validation:Maximum=65535
8484
// +kubebuilder:validation:Required
85-
Number int32 `json:"number"`
85+
Number PortNumber `json:"number"`
8686
}
8787

8888
// Extension specifies how to configure an extension that runs the endpoint picker.

‎apix/v1alpha2/inferencepool_conversion.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (src *InferencePool) ConvertTo(dst *v1.InferencePool) error {
4141
}
4242
dst.TypeMeta = src.TypeMeta
4343
dst.ObjectMeta = src.ObjectMeta
44-
dst.Spec.TargetPorts = []v1.Port{{Number: src.Spec.TargetPortNumber}}
44+
dst.Spec.TargetPorts = []v1.Port{{Number: v1.PortNumber(src.Spec.TargetPortNumber)}}
4545
dst.Spec.ExtensionRef = v1Extension
4646
dst.Status = *v1Status
4747
if src.Spec.Selector != nil {
@@ -68,7 +68,7 @@ func (dst *InferencePool) ConvertFrom(src *v1.InferencePool) error {
6868
}
6969
dst.TypeMeta = src.TypeMeta
7070
dst.ObjectMeta = src.ObjectMeta
71-
dst.Spec.TargetPortNumber = src.Spec.TargetPorts[0].Number
71+
dst.Spec.TargetPortNumber = int32(src.Spec.TargetPorts[0].Number)
7272
dst.Spec.ExtensionRef = extensionRef
7373
dst.Status = *status
7474
if src.Spec.Selector.MatchLabels != nil {

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func (pm *podMetrics) refreshMetrics() error {
120120
if len(pool.Spec.TargetPorts) != 1 {
121121
return fmt.Errorf("expected 1 target port, got %d", len(pool.Spec.TargetPorts))
122122
}
123-
updated, err := pm.pmc.FetchMetrics(ctx, pm.GetPod(), pm.GetMetrics(), pool.Spec.TargetPorts[0].Number)
123+
updated, err := pm.pmc.FetchMetrics(ctx, pm.GetPod(), pm.GetMetrics(), int32(pool.Spec.TargetPorts[0].Number))
124124
if err != nil {
125125
pm.logger.V(logutil.TRACE).Info("Failed to refreshed metrics:", "err", err)
126126
}

‎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{{Number: int32(8000)}},
64+
TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8000))}},
6565
Selector: v1.LabelSelector{
6666
MatchLabels: map[v1.LabelKey]v1.LabelValue{
6767
"some-key": "some-val",
@@ -79,7 +79,7 @@ func TestPodReconciler(t *testing.T) {
7979
existingPods: []*corev1.Pod{basePod1, basePod2},
8080
pool: &v1.InferencePool{
8181
Spec: v1.InferencePoolSpec{
82-
TargetPorts: []v1.Port{{Number: int32(8000)}},
82+
TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8000))}},
8383
Selector: v1.LabelSelector{
8484
MatchLabels: map[v1.LabelKey]v1.LabelValue{
8585
"some-key": "some-val",
@@ -97,7 +97,7 @@ func TestPodReconciler(t *testing.T) {
9797
existingPods: []*corev1.Pod{basePod1, basePod2},
9898
pool: &v1.InferencePool{
9999
Spec: v1.InferencePoolSpec{
100-
TargetPorts: []v1.Port{{Number: int32(8000)}},
100+
TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8000))}},
101101
Selector: v1.LabelSelector{
102102
MatchLabels: map[v1.LabelKey]v1.LabelValue{
103103
"some-key": "some-val",
@@ -116,7 +116,7 @@ func TestPodReconciler(t *testing.T) {
116116
existingPods: []*corev1.Pod{basePod1, basePod2},
117117
pool: &v1.InferencePool{
118118
Spec: v1.InferencePoolSpec{
119-
TargetPorts: []v1.Port{{Number: int32(8000)}},
119+
TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8000))}},
120120
Selector: v1.LabelSelector{
121121
MatchLabels: map[v1.LabelKey]v1.LabelValue{
122122
"some-key": "some-val",
@@ -132,7 +132,7 @@ func TestPodReconciler(t *testing.T) {
132132
existingPods: []*corev1.Pod{basePod1, basePod2},
133133
pool: &v1.InferencePool{
134134
Spec: v1.InferencePoolSpec{
135-
TargetPorts: []v1.Port{{Number: int32(8000)}},
135+
TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8000))}},
136136
Selector: v1.LabelSelector{
137137
MatchLabels: map[v1.LabelKey]v1.LabelValue{
138138
"some-key": "some-val",
@@ -149,7 +149,7 @@ func TestPodReconciler(t *testing.T) {
149149
existingPods: []*corev1.Pod{basePod1, basePod2},
150150
pool: &v1.InferencePool{
151151
Spec: v1.InferencePoolSpec{
152-
TargetPorts: []v1.Port{{Number: int32(8000)}},
152+
TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8000))}},
153153
Selector: v1.LabelSelector{
154154
MatchLabels: map[v1.LabelKey]v1.LabelValue{
155155
"some-key": "some-val",
@@ -167,7 +167,7 @@ func TestPodReconciler(t *testing.T) {
167167
existingPods: []*corev1.Pod{basePod1, basePod2},
168168
pool: &v1.InferencePool{
169169
Spec: v1.InferencePoolSpec{
170-
TargetPorts: []v1.Port{{Number: int32(8000)}},
170+
TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8000))}},
171171
Selector: v1.LabelSelector{
172172
MatchLabels: map[v1.LabelKey]v1.LabelValue{
173173
"some-key": "some-val",

‎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{{Number: int32(8000)}},
248+
TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8000))}},
249249
},
250250
}
251251
)

‎pkg/epp/metrics/collectors/inference_pool_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func TestMetricsCollected(t *testing.T) {
8080
Name: "test-pool",
8181
},
8282
Spec: v1.InferencePoolSpec{
83-
TargetPorts: []v1.Port{{Number: int32(8000)}},
83+
TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8000))}},
8484
},
8585
}
8686
_ = ds.PoolSet(context.Background(), fakeClient, inferencePool)

‎pkg/epp/requestcontrol/director_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func TestDirector_HandleRequest(t *testing.T) {
101101
pool := &v1.InferencePool{
102102
ObjectMeta: metav1.ObjectMeta{Name: "test-pool", Namespace: "default"},
103103
Spec: v1.InferencePoolSpec{
104-
TargetPorts: []v1.Port{{Number: int32(8000)}},
104+
TargetPorts: []v1.Port{{Number: v1.PortNumber(int32(8000))}},
105105
Selector: v1.LabelSelector{
106106
MatchLabels: map[v1.LabelKey]v1.LabelValue{
107107
"app": "inference",

‎pkg/epp/util/testing/wrappers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ func (m *InferencePoolWrapper) Selector(selector map[string]string) *InferencePo
201201
}
202202

203203
func (m *InferencePoolWrapper) TargetPorts(p int32) *InferencePoolWrapper {
204-
m.Spec.TargetPorts = []v1.Port{{Number: p}}
204+
m.Spec.TargetPorts = []v1.Port{{Number: v1.PortNumber(p)}}
205205
return m
206206
}
207207

‎test/utils/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func PrepareForTestStreamingServer(objectives []*v1alpha2.InferenceObjective, po
7171
WithObjects(initObjs...).
7272
Build()
7373
pool := testutil.MakeInferencePool(poolName).Namespace(namespace).ObjRef()
74-
pool.Spec.TargetPorts = []v1.Port{{Number: poolPort}}
74+
pool.Spec.TargetPorts = []v1.Port{{Number: v1.PortNumber(poolPort)}}
7575
_ = ds.PoolSet(context.Background(), fakeClient, pool)
7676

7777
return ctx, cancel, ds, pmc

0 commit comments

Comments
 (0)