Apply suggestions from code review

Co-authored-by: Simon Gerber <[email protected]>
appuio · Jun 18, 2024 · 1656ef9 · 1656ef9
1 parent f207313
commit 1656ef9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/component/machine-sets.jsonnet b/component/machine-sets.jsonnet
@@ -71,19 +71,19 @@ local cpMachineSetSpecs = function(set)
     },
   } + {
     metadata+: {
-      annotations+: com.getValueOrDefault(set, 'annotations', {}),
+      annotations+: std.get(set, 'annotations', {}),
       namespace: params.machineApiNamespace,
     },
     spec+: {
-      replicas: com.getValueOrDefault(set, 'replicas', 1),
+      replicas: std.get(set, 'replicas', 1),
       selector+: {
         matchLabels+: {
           'machine.openshift.io/cluster-api-cluster': params.infrastructureID,
           'machine.openshift.io/cluster-api-machine-role': 'master',
           'machine.openshift.io/cluster-api-machine-type': 'master',
         },
       },
-      state+: 'Inactive',
+      state: 'Inactive',
       strategy+: {
         type: 'OnDelete',
       },
@@ -101,8 +101,6 @@ local cpMachineSetSpecs = function(set)
             },
           },
           spec+: {
-            lifecycleHooks+: {},
-            metadata+: {},
             [if isGCP then 'providerSpec']+: {
               value+: {
                 machineType: set.instanceType,
@@ -119,8 +117,8 @@ local cpMachineSetSpecs = function(set)
   };
 
 local machineSet = function(name, set)
-  local role = if std.objectHas(set, 'role') then set.role else name;
-  local spec = if std.objectHas(set, 'spec') then com.makeMergeable(set.spec) else {};
+  local role = std.get(set, 'role', name);
+  local spec = com.makeMergeable(std.get(set, 'spec', {}));
   if role == 'master' then cpMachineSetSpecs(set) { spec+: spec }
   else machineSetSpecs(name, set, role) { spec+: spec };
 

diff --git a/tests/golden/gcp/openshift4-nodes/openshift4-nodes/machineset-master.yaml b/tests/golden/gcp/openshift4-nodes/openshift4-nodes/machineset-master.yaml
@@ -27,8 +27,6 @@ spec:
           machine.openshift.io/cluster-api-machine-role: master
           machine.openshift.io/cluster-api-machine-type: master
       spec:
-        lifecycleHooks: {}
-        metadata: {}
         providerSpec:
           value:
             apiVersion: gcpprovider.openshift.io/v1beta1