ztp: Adapt MergeMachineConfigs to new api

Changes due to MCO adaptation to use new format image. See openshift/machine-config-operator#3317 for more info.
jlojosnegros · May 3, 2023 · 2056b12 · 2056b12
1 parent e8b8235
commit 2056b12
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ztp/siteconfig-generator/siteConfig/siteConfigHelper.go b/ztp/siteconfig-generator/siteConfig/siteConfigHelper.go
@@ -45,9 +45,9 @@ func MergeManifests(individualMachineConfigs map[string]interface{}, doNotMerge
 	}
 
 	for roleName, machineConfigs := range mergableMachineConfigs {
-		var osImageURL string = ""
+		cconfig := &machineconfigv1.ControllerConfig{}
 		//It only uses OSImageURL provided by the CVO
-		merged, err := mcfgctrlcommon.MergeMachineConfigs(machineConfigs, osImageURL)
+		merged, err := mcfgctrlcommon.MergeMachineConfigs(machineConfigs, cconfig)
 		if err != nil {
 			return nil, err
 		}