From 9c3c190bc042aeeab0fb4970e06d1e5e1c5c264a Mon Sep 17 00:00:00 2001
From: Christian Haeusler <haeusler.christian@mac.com>
Date: Tue, 30 Jun 2020 15:51:07 +0200
Subject: [PATCH] Apply new helpers from Commodore library

---
 component/main.jsonnet | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/component/main.jsonnet b/component/main.jsonnet
index 186afe3..fcfb82b 100644
--- a/component/main.jsonnet
+++ b/component/main.jsonnet
@@ -17,7 +17,7 @@ local machineSet = function(name, set)
       namespace: params.namespace,
     },
     spec+: {
-      replicas: if std.objectHas(set, 'replicas') then set.replicas else 1,
+      replicas: com.getValueOrDefault(set, 'replicas', 1),
       selector+: {
         matchLabels+: {
           'machine.openshift.io/cluster-api-cluster': params.infrastructureID,
@@ -53,7 +53,7 @@ local machineSet = function(name, set)
       },
     },
   }
-  + if std.objectHas(set, 'spec') then { spec+: set.spec } else {};
+  + if std.objectHas(set, 'spec') then { spec+: com.makeMergeable(set.spec) } else {};
 
 local isMultiAz = function(name)
   std.objectHas(params.nodeGroups[name], 'multiAz') && params.nodeGroups[name].multiAz == true;