Merge pull request #4329 from eslutsky/USHIFT-5217

openshift-merge-bot[bot] · web-flow · commit 0b62a2c7e014 · 2024-12-17T22:09:19.000Z
USHIFT-5217: when ovn.yaml file empty the default is overridden with nil
diff --git a/pkg/config/ovn/ovn.go b/pkg/config/ovn/ovn.go
@@ -98,7 +98,7 @@ func newOVNKubernetesConfigFromFile(path string, multinode bool) (*OVNKubernetes
 		return nil, err
 	}
 
-	err = yaml.Unmarshal(buf, &o)
+	err = yaml.Unmarshal(buf, o)
 	if err != nil {
 		return nil, fmt.Errorf("parsing OVNKubernetes config: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func newOVNKubernetesConfigFromFile(path string, multinode bool) (*OVNKubernetes`
`98`	`98`	`return nil, err`
`99`	`99`	`}`
`100`	`100`
`101`		`- err = yaml.Unmarshal(buf, &o)`
	`101`	`+ err = yaml.Unmarshal(buf, o)`
`102`	`102`	`if err != nil {`
`103`	`103`	`return nil, fmt.Errorf("parsing OVNKubernetes config: %v", err)`
`104`	`104`	`}`