Skip to content

Commit 4207d68

Browse files
committed
change extension to be non-nil pointer
1 parent 369ce0a commit 4207d68

File tree

8 files changed

+11
-13
lines changed

8 files changed

+11
-13
lines changed

api/v1/inferencepool_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ type InferencePoolSpec struct {
7474
TargetPorts []Port `json:"targetPorts,omitempty"`
7575

7676
// Extension configures an endpoint picker as an extension service.
77-
// +optional
77+
// +required
7878
ExtensionRef Extension `json:"extensionRef,omitempty,omitzero"`
7979
}
8080

apix/v1alpha2/inferencepool_conversion.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (src *InferencePool) ConvertTo(dst *v1.InferencePool) error {
3131
if dst == nil {
3232
return errors.New("dst cannot be nil")
3333
}
34-
v1Extension, err := convertExtensionRefToV1(src.Spec.ExtensionRef)
34+
v1Extension, err := convertExtensionRefToV1(&src.Spec.ExtensionRef)
3535
if err != nil {
3636
return err
3737
}
@@ -69,7 +69,7 @@ func (dst *InferencePool) ConvertFrom(src *v1.InferencePool) error {
6969
dst.TypeMeta = src.TypeMeta
7070
dst.ObjectMeta = src.ObjectMeta
7171
dst.Spec.TargetPortNumber = int32(src.Spec.TargetPorts[0].Number)
72-
dst.Spec.ExtensionRef = extensionRef
72+
dst.Spec.ExtensionRef = *extensionRef
7373
dst.Status = *status
7474
if src.Spec.Selector.MatchLabels != nil {
7575
dst.Spec.Selector = make(map[LabelKey]LabelValue, len(src.Spec.Selector.MatchLabels))

apix/v1alpha2/inferencepool_conversion_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func TestInferencePoolConvertTo(t *testing.T) {
6060
"app": "my-model-server",
6161
},
6262
TargetPortNumber: 8080,
63-
ExtensionRef: &Extension{
63+
ExtensionRef: Extension{
6464
Group: &group,
6565
Kind: &kind,
6666
Name: "my-epp-service",
@@ -273,7 +273,7 @@ func TestInferencePoolConvertFrom(t *testing.T) {
273273
"app": "my-model-server",
274274
},
275275
TargetPortNumber: 8080,
276-
ExtensionRef: &Extension{
276+
ExtensionRef: Extension{
277277
Group: &group,
278278
Kind: &kind,
279279
Name: "my-epp-service",

apix/v1alpha2/inferencepool_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ type InferencePoolSpec struct {
7070
TargetPortNumber int32 `json:"targetPortNumber"`
7171

7272
// Extension configures an endpoint picker as an extension service.
73-
// +optional
74-
ExtensionRef *Extension `json:"extensionRef,omitempty"`
73+
// +required
74+
ExtensionRef Extension `json:"extensionRef,omitempty"`
7575
}
7676

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

apix/v1alpha2/zz_generated.deepcopy.go

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ spec:
153153
- number
154154
x-kubernetes-list-type: map
155155
required:
156+
- extensionRef
156157
- selector
157158
- targetPorts
158159
type: object

config/crd/bases/inference.networking.x-k8s.io_inferencepools.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ spec:
130130
minimum: 1
131131
type: integer
132132
required:
133+
- extensionRef
133134
- selector
134135
- targetPortNumber
135136
type: object

pkg/epp/util/testing/wrappers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func (m *XInferencePoolWrapper) TargetPortNumber(p int32) *XInferencePoolWrapper
252252
}
253253

254254
func (m *XInferencePoolWrapper) ExtensionRef(name string) *XInferencePoolWrapper {
255-
m.Spec.ExtensionRef = &v1alpha2.Extension{Name: v1alpha2.ObjectName(name)}
255+
m.Spec.ExtensionRef = v1alpha2.Extension{Name: v1alpha2.ObjectName(name)}
256256
return m
257257
}
258258

0 commit comments

Comments
 (0)