Skip to content

Commit 0896625

Browse files
committed
updated conversion
1 parent 49d2c43 commit 0896625

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

apix/v1alpha2/inferencepool_conversion.go

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (src *InferencePool) ConvertTo(dst *v1.InferencePool) error {
4242
dst.TypeMeta = src.TypeMeta
4343
dst.ObjectMeta = src.ObjectMeta
4444
dst.Spec.TargetPorts = []v1.Port{{Number: v1.PortNumber(int32(src.Spec.TargetPortNumber))}}
45-
dst.Spec.ExtensionRef = *v1Extension
45+
dst.Spec.ExtensionRef = v1Extension
4646
dst.Status = *v1Status
4747
if src.Spec.Selector != nil {
4848
dst.Spec.Selector.MatchLabels = make(map[v1.LabelKey]v1.LabelValue, len(src.Spec.Selector))
@@ -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))
@@ -102,34 +102,28 @@ func convertStatusFromV1(src *v1.InferencePoolStatus) (*InferencePoolStatus, err
102102
return convert[InferencePoolStatus](u)
103103
}
104104

105-
func convertExtensionRefToV1(src *Extension) (*v1.Extension, error) {
106-
if src == nil {
107-
return nil, nil
108-
}
105+
func convertExtensionRefToV1(src *Extension) (v1.Extension, error) {
109106
u, err := toUnstructured(src)
110107
if err != nil {
111-
return nil, err
108+
return v1.Extension{}, err
112109
}
113110
out, err := convert[v1.Extension](u)
114111
if err != nil {
115-
return nil, err
112+
return v1.Extension{}, err
116113
}
117-
return out, nil
114+
return *out, nil
118115
}
119116

120-
func convertExtensionRefFromV1(src *v1.Extension) (*Extension, error) {
121-
if src == nil {
122-
return nil, nil
123-
}
124-
u, err := toUnstructured(src)
117+
func convertExtensionRefFromV1(src *v1.Extension) (Extension, error) {
118+
u, err := toUnstructured(&src)
125119
if err != nil {
126-
return nil, err
120+
return Extension{}, err
127121
}
128122
extension, err := convert[Extension](u)
129123
if err != nil {
130-
return nil, err
124+
return Extension{}, err
131125
}
132-
return extension, nil
126+
return *extension, nil
133127
}
134128

135129
func toUnstructured(obj any) (*unstructured.Unstructured, error) {

0 commit comments

Comments
 (0)