Allow managing raw MachineSets

class/defaults.yml

@@ -84,6 +84,8 @@ parameters:
 
     nodeGroups: {}
 
+    machineSets: {}
+
     machineConfigPools:
       infra: {}
       app: {}

component/machine-sets.jsonnet

@@ -150,11 +150,18 @@ local machineSpecs = [
   if isGCP && isMultiAz(name)
 ]);
 
+local additionalMachineSets = com.generateResources(params.machineSets, function(name) kube._Object('machine.openshift.io/v1beta1', 'MachineSet', name) {
+  metadata+: {
+    namespace: params.machineApiNamespace,
+  },
+});
 
 {
   ['machineset-' + m.name]: machineSet(m.name, m.spec)
   for m in machineSpecs
   if m.spec != null
 } + {
-  [if std.length(machineSpecs) == 0 then '.gitkeep']: {},
+  [if std.length(machineSpecs) == 0 && std.length(additionalMachineSets) == 0 then '.gitkeep']: {},
+} + {
+  [if std.length(additionalMachineSets) > 0 then 'additional_machine_sets']: additionalMachineSets,
 }

docs/modules/ROOT/pages/references/parameters.adoc

@@ -488,6 +488,64 @@ See the documentation for http://localhost:2020/cilium/references/parameters.htm
 
 The script expects the ConfigMap to have a key matching each node name on which egress dummy interfaces should be configured.
 
+
+== `machineSets`
+
+[horizontal]
+type:: dictionary
+default:: `{}`
+example::
++
+[source,yaml]
+----
+machineSets:
+  worker:
+    metadata:
+      labels:
+        machine.openshift.io/cluster-api-cluster: c-cluster-1
+    spec:
+      deletePolicy: Oldest
+      replicas: 3
+      selector:
+        matchLabels:
+          machine.openshift.io/cluster-api-cluster: c-cluster-1
+          machine.openshift.io/cluster-api-machineset: worker
+      template:
+        metadata:
+          labels:
+            machine.openshift.io/cluster-api-cluster: c-cluster-1
+            machine.openshift.io/cluster-api-machine-role: app
+            machine.openshift.io/cluster-api-machine-type: app
+            machine.openshift.io/cluster-api-machineset: worker
+        spec:
+          lifecycleHooks: {}
+          metadata:
+            labels:
+              node-role.kubernetes.io/app: ""
+              node-role.kubernetes.io/worker: ""
+          providerSpec:
+            value:
+              antiAffinityKey: worker
+              baseDomain: c-cluster-1.vshnmanaged.net
+              flavor: plus-16-4
+              image: custom:rhcos-4.16
+              interfaces:
+                - addresses:
+                    - subnetUUID: 1971d4c3-0065-41fc-82f4-c26cf2fe4f9a
+                  type: Private
+              rootVolumeSizeGB: 100
+              tokenSecret:
+                name: cloudscale-rw-token
+              userDataSecret:
+                name: cloudscale-user-data
+              zone: lpg1
+----
+
+A dictionary of machine sets to create on the cluster.
+The resulting `MachineSet` object will have the key as the name and the value is merged into the resource.
+
+The MachineSet will will have the namespace from `machine_api_namespace` applied.
+
 === Example
 
 [source,yaml]

tests/golden/machineconfig/openshift4-nodes/openshift4-nodes/additional_machine_sets.yaml

@@ -0,0 +1,45 @@
+apiVersion: machine.openshift.io/v1beta1
+kind: MachineSet
+metadata:
+  annotations: {}
+  labels:
+    machine.openshift.io/cluster-api-cluster: c-cluster-1
+    name: worker
+  name: worker
+  namespace: openshift-machine-api
+spec:
+  deletePolicy: Oldest
+  replicas: 3
+  selector:
+    matchLabels:
+      machine.openshift.io/cluster-api-cluster: c-cluster-1
+      machine.openshift.io/cluster-api-machineset: worker
+  template:
+    metadata:
+      labels:
+        machine.openshift.io/cluster-api-cluster: c-cluster-1
+        machine.openshift.io/cluster-api-machine-role: app
+        machine.openshift.io/cluster-api-machine-type: app
+        machine.openshift.io/cluster-api-machineset: worker
+    spec:
+      lifecycleHooks: {}
+      metadata:
+        labels:
+          node-role.kubernetes.io/app: ''
+          node-role.kubernetes.io/worker: ''
+      providerSpec:
+        value:
+          antiAffinityKey: worker
+          baseDomain: c-cluster-1.vshnmanaged.net
+          flavor: plus-16-4
+          image: custom:rhcos-4.16
+          interfaces:
+            - addresses:
+                - subnetUUID: 1971d4c3-0065-41fc-82f4-c26cf2fe4f9a
+              type: Private
+          rootVolumeSizeGB: 100
+          tokenSecret:
+            name: cloudscale-rw-token
+          userDataSecret:
+            name: cloudscale-user-data
+          zone: lpg1

tests/machineconfig.yml

@@ -91,3 +91,45 @@ parameters:
     egressInterfaces:
       machineConfigPools:
         - infra
+
+    machineSets:
+      worker:
+        metadata:
+          labels:
+            machine.openshift.io/cluster-api-cluster: c-cluster-1
+        spec:
+          deletePolicy: Oldest
+          replicas: 3
+          selector:
+            matchLabels:
+              machine.openshift.io/cluster-api-cluster: c-cluster-1
+              machine.openshift.io/cluster-api-machineset: worker
+          template:
+            metadata:
+              labels:
+                machine.openshift.io/cluster-api-cluster: c-cluster-1
+                machine.openshift.io/cluster-api-machine-role: app
+                machine.openshift.io/cluster-api-machine-type: app
+                machine.openshift.io/cluster-api-machineset: worker
+            spec:
+              lifecycleHooks: {}
+              metadata:
+                labels:
+                  node-role.kubernetes.io/app: ""
+                  node-role.kubernetes.io/worker: ""
+              providerSpec:
+                value:
+                  antiAffinityKey: worker
+                  baseDomain: c-cluster-1.vshnmanaged.net
+                  flavor: plus-16-4
+                  image: custom:rhcos-4.16
+                  interfaces:
+                    - addresses:
+                        - subnetUUID: 1971d4c3-0065-41fc-82f4-c26cf2fe4f9a
+                      type: Private
+                  rootVolumeSizeGB: 100
+                  tokenSecret:
+                    name: cloudscale-rw-token
+                  userDataSecret:
+                    name: cloudscale-user-data
+                  zone: lpg1