Skip to content

Commit a1e28ad

Browse files
capri-xiyuecapri-xiyue
committed
partially fix conflicts
1 parent bde16d2 commit a1e28ad

File tree

5 files changed

+35
-53
lines changed

5 files changed

+35
-53
lines changed

‎api/v1/zz_generated.deepcopy.go

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

‎apix/v1alpha2/inferencepool_conversion.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (src *InferencePool) ConvertTo() (*v1.InferencePool, error) {
3232
return nil, nil
3333
}
3434

35-
v1Extension, err := convertEndpointPickerConfToV1(&src.Spec.EndpointPickerConfig)
35+
v1Extension, err := convertExtensionRefToV1(&src.Spec.ExtensionRef)
3636
if err != nil {
3737
return nil, err
3838
}
@@ -111,16 +111,16 @@ func converStatusFromV1(src v1.InferencePoolStatus) (*InferencePoolStatus, error
111111
return convert[InferencePoolStatus](u)
112112
}
113113

114-
func convertEndpointPickerConfToV1(src *EndpointPickerConfig) (*v1.Extension, error) {
115-
extension := src.ExtensionRef
114+
func convertExtensionRefToV1(src *Extension) (*v1.Extension, error) {
115+
extension := src
116116
u, err := toUnstructured(&extension)
117117
if err != nil {
118118
return nil, err
119119
}
120120
return convert[v1.Extension](u)
121121
}
122122

123-
func convertEndpointPickerConfigFromV1(src *v1.Extension) (*EndpointPickerConfig, error) {
123+
func convertExtensionRefFromV1(src *v1.Extension) (*Extension, error) {
124124
u, err := toUnstructured(&src)
125125
if err != nil {
126126
return nil, err

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

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

‎pkg/epp/controller/pod_reconciler_test.go

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ func TestPodReconciler(t *testing.T) {
6262
pool: &v1.InferencePool{
6363
Spec: v1.InferencePoolSpec{
6464
TargetPorts: []v1.Port{{Number: int32(8000)}},
65-
Selector: map[v1.LabelKey]v1.LabelValue{
66-
"some-key": "some-val",
67-
TargetPortNumber: int32(8000),
6865
Selector: v1.LabelSelector{
6966
MatchLabels: map[v1.LabelKey]v1.LabelValue{
7067
"some-key": "some-val",
@@ -83,9 +80,6 @@ func TestPodReconciler(t *testing.T) {
8380
pool: &v1.InferencePool{
8481
Spec: v1.InferencePoolSpec{
8582
TargetPorts: []v1.Port{{Number: int32(8000)}},
86-
Selector: map[v1.LabelKey]v1.LabelValue{
87-
"some-key": "some-val",
88-
TargetPortNumber: int32(8000),
8983
Selector: v1.LabelSelector{
9084
MatchLabels: map[v1.LabelKey]v1.LabelValue{
9185
"some-key": "some-val",
@@ -104,9 +98,6 @@ func TestPodReconciler(t *testing.T) {
10498
pool: &v1.InferencePool{
10599
Spec: v1.InferencePoolSpec{
106100
TargetPorts: []v1.Port{{Number: int32(8000)}},
107-
Selector: map[v1.LabelKey]v1.LabelValue{
108-
"some-key": "some-val",
109-
TargetPortNumber: int32(8000),
110101
Selector: v1.LabelSelector{
111102
MatchLabels: map[v1.LabelKey]v1.LabelValue{
112103
"some-key": "some-val",
@@ -126,9 +117,6 @@ func TestPodReconciler(t *testing.T) {
126117
pool: &v1.InferencePool{
127118
Spec: v1.InferencePoolSpec{
128119
TargetPorts: []v1.Port{{Number: int32(8000)}},
129-
Selector: map[v1.LabelKey]v1.LabelValue{
130-
"some-key": "some-val",
131-
TargetPortNumber: int32(8000),
132120
Selector: v1.LabelSelector{
133121
MatchLabels: map[v1.LabelKey]v1.LabelValue{
134122
"some-key": "some-val",
@@ -145,9 +133,6 @@ func TestPodReconciler(t *testing.T) {
145133
pool: &v1.InferencePool{
146134
Spec: v1.InferencePoolSpec{
147135
TargetPorts: []v1.Port{{Number: int32(8000)}},
148-
Selector: map[v1.LabelKey]v1.LabelValue{
149-
"some-key": "some-val",
150-
TargetPortNumber: int32(8000),
151136
Selector: v1.LabelSelector{
152137
MatchLabels: map[v1.LabelKey]v1.LabelValue{
153138
"some-key": "some-val",
@@ -165,9 +150,6 @@ func TestPodReconciler(t *testing.T) {
165150
pool: &v1.InferencePool{
166151
Spec: v1.InferencePoolSpec{
167152
TargetPorts: []v1.Port{{Number: int32(8000)}},
168-
Selector: map[v1.LabelKey]v1.LabelValue{
169-
"some-key": "some-val",
170-
TargetPortNumber: int32(8000),
171153
Selector: v1.LabelSelector{
172154
MatchLabels: map[v1.LabelKey]v1.LabelValue{
173155
"some-key": "some-val",
@@ -186,9 +168,6 @@ func TestPodReconciler(t *testing.T) {
186168
pool: &v1.InferencePool{
187169
Spec: v1.InferencePoolSpec{
188170
TargetPorts: []v1.Port{{Number: int32(8000)}},
189-
Selector: map[v1.LabelKey]v1.LabelValue{
190-
"some-key": "some-val",
191-
TargetPortNumber: int32(8000),
192171
Selector: v1.LabelSelector{
193172
MatchLabels: map[v1.LabelKey]v1.LabelValue{
194173
"some-key": "some-val",

‎pkg/epp/requestcontrol/director_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ func TestDirector_HandleRequest(t *testing.T) {
102102
ObjectMeta: metav1.ObjectMeta{Name: "test-pool", Namespace: "default"},
103103
Spec: v1.InferencePoolSpec{
104104
TargetPorts: []v1.Port{{Number: int32(8000)}},
105-
Selector: map[v1.LabelKey]v1.LabelValue{
106-
"app": "inference",
107-
TargetPortNumber: int32(8000),
108105
Selector: v1.LabelSelector{
109106
MatchLabels: map[v1.LabelKey]v1.LabelValue{
110107
"app": "inference",

0 commit comments

Comments
 (0)