Use seperate defaultSpecs for ControlPlaneMachineSet (#85)

* Use seperate defaultSpecs for ControlPlaneMachineSet * Apply suggestions from code review Co-authored-by: Simon Gerber <[email protected]> --------- Co-authored-by: Simon Gerber <[email protected]>
appuio · Jun 19, 2024 · 487ea6f · 487ea6f
1 parent af08510
commit 487ea6f
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 12 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -4,6 +4,7 @@ parameters:
     projectName: none
     infrastructureID: none
     defaultSpecs:
+      vsphere: {}
       aws: {}
       azure: {}
       gcp:
@@ -42,6 +43,42 @@ parameters:
                 tags: []
                 userDataSecret:
                   name: worker-user-data
+    controlPlaneDefaultSpecs:
+      vsphere: {}
+      aws: {}
+      azure: {}
+      gcp:
+        template:
+          machines_v1beta1_machine_openshift_io:
+            spec:
+              providerSpec:
+                value:
+                  apiVersion: gcpprovider.openshift.io/v1beta1
+                  canIPForward: false
+                  credentialsSecret:
+                    name: gcp-cloud-credentials
+                  deletionProtection: false
+                  disks:
+                    - autoDelete: true
+                      boot: true
+                      image: ${openshift4_nodes:infrastructureID}-rhcos-image
+                      labels: null
+                      sizeGb: 128
+                      type: pd-ssd
+                  kind: GCPMachineProviderSpec
+                  metadata:
+                    creationTimestamp: null
+                  networkInterfaces:
+                    - network: ${openshift4_nodes:infrastructureID}-network
+                      subnetwork: ${openshift4_nodes:infrastructureID}-worker-subnet
+                  projectID: ${openshift4_nodes:projectName}
+                  region: ${facts:region}
+                  serviceAccounts:
+                    - email: ${openshift4_nodes:infrastructureID}-w@${openshift4_nodes:projectName}.iam.gserviceaccount.com
+                      scopes:
+                        - https://www.googleapis.com/auth/cloud-platform
+                  userDataSecret:
+                    name: master-user-data
     nodeConfig:
       cgroupMode: v1
 

diff --git a/component/machine-sets.jsonnet b/component/machine-sets.jsonnet
@@ -58,17 +58,7 @@ local machineSetSpecs = function(name, set, role)
 
 local cpMachineSetSpecs = function(set)
   kube._Object('machine.openshift.io/v1', 'ControlPlaneMachineSet', 'cluster') {
-    spec+: {
-      template+: {
-        machines_v1beta1_machine_openshift_io: {
-          spec+: {
-            providerSpec+: {
-              value+: params.defaultSpecs[inv.parameters.facts.cloud].template.spec.providerSpec.value,
-            },
-          },
-        },
-      },
-    },
+    spec+: params.controlPlaneDefaultSpecs[inv.parameters.facts.cloud],
   } + {
     metadata+: {
       annotations+: std.get(set, 'annotations', {}),

diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc
@@ -39,6 +39,17 @@ A dictionary holding the default values applied to each `machinesets.machine.ope
 The top level keys are the names of cloud providers as reported by the cluster fact `${facts:cloud}`.
 The values can be everything that's accepted in the `spec` field of a `machinesets.machine.openshift.io` object.
 
+== `controlPlaneDefaultSpecs`
+
+[horizontal]
+type:: dictionary
+default:: Sensible defaults for a growing number of cloud providers.
+
+A dictionary holding the default values applied to each `controlplanemachinesets.machine.openshift.io` object created by this component.
+
+The top level keys are the names of cloud providers as reported by the cluster fact `${facts:cloud}`.
+The values can be everything that's accepted in the `spec` field of a `controlplanemachinesets.machine.openshift.io` object.
+
 == `infrastructureID`
 
 [horizontal]

diff --git a/tests/golden/gcp/openshift4-nodes/openshift4-nodes/machineset-master.yaml b/tests/golden/gcp/openshift4-nodes/openshift4-nodes/machineset-master.yaml
@@ -57,5 +57,5 @@ spec:
             tags:
               - infra-id-master
             userDataSecret:
-              name: worker-user-data
+              name: master-user-data
             zone: europe-west6-a