Skip to content

Commit cf1f685

Browse files
authoredJul 31, 2024
Merge pull request #699 from ovh/dev/aamstutz/fix-kube-tests
fix: Improve readability when setting template property of ovh_cloud_project_kube_nodepool
2 parents fae188a + c25065d commit cf1f685

File tree

1 file changed

+25
-28
lines changed

1 file changed

+25
-28
lines changed
 

‎ovh/types_cloud_project_kube_nodepool.go

+25-28
Original file line numberDiff line numberDiff line change
@@ -357,38 +357,35 @@ func (v CloudProjectKubeNodePoolResponse) ToMap() map[string]interface{} {
357357

358358
// If the template is not nil and not empty, then we need to add it to the map
359359
if v.Template != nil && !reflect.DeepEqual(v.Template, emptyTemplateResponse) {
360-
obj["template"] = []map[string]interface{}{{}}
361-
362-
// template.metadata
363-
{
364-
data := map[string]interface{}{
365-
"finalizers": v.Template.Metadata.Finalizers,
366-
"labels": v.Template.Metadata.Labels,
367-
"annotations": v.Template.Metadata.Annotations,
368-
}
369-
370-
obj["template"].([]map[string]interface{})[0]["metadata"] = []map[string]interface{}{data}
371-
}
372-
373360
// template.spec
374-
{
375-
data := map[string]interface{}{
376-
"unschedulable": v.Template.Spec.Unschedulable,
377-
}
378-
379-
var taints []map[string]interface{}
380-
for _, taint := range v.Template.Spec.Taints {
381-
t := map[string]interface{}{
382-
"effect": taint.Effect.String(),
383-
"key": taint.Key,
384-
"value": taint.Value,
385-
}
361+
specData := map[string]interface{}{
362+
"unschedulable": v.Template.Spec.Unschedulable,
363+
}
386364

387-
taints = append(taints, t)
365+
var taints []map[string]interface{}
366+
for _, taint := range v.Template.Spec.Taints {
367+
t := map[string]interface{}{
368+
"effect": taint.Effect.String(),
369+
"key": taint.Key,
370+
"value": taint.Value,
388371
}
389-
data["taints"] = taints
390372

391-
obj["template"].([]map[string]interface{})[0]["spec"] = []map[string]interface{}{data}
373+
taints = append(taints, t)
374+
}
375+
specData["taints"] = taints
376+
377+
obj["template"] = []map[string]interface{}{
378+
{
379+
// template.metadata
380+
"metadata": []map[string]interface{}{
381+
{
382+
"finalizers": v.Template.Metadata.Finalizers,
383+
"labels": v.Template.Metadata.Labels,
384+
"annotations": v.Template.Metadata.Annotations,
385+
},
386+
},
387+
"spec": []map[string]interface{}{specData},
388+
},
392389
}
393390
}
394391

0 commit comments

Comments
 (0)