Merge pull request #33 from matthewei/main

✨ allow Ironic to set nodeSelector

api/v1alpha1/ironic_types.go

@@ -197,6 +197,11 @@ type IronicSpec struct {
 	// RamdiskSSHKey is the contents of the public key to inject into the ramdisk for debugging purposes.
 	// +optional
 	RamdiskSSHKey string `json:"ramdiskSSHKey,omitempty"`
+	// NodeSelector is a selector which must be true for the Ironic pod to fit on a node.
+	// Selector which must match a node's labels for the vmi to be scheduled on that node.
+	// More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+	// +optional
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 }
 
 // IronicStatus defines the observed state of Ironic

config/crd/bases/metal3.io_ironics.yaml

@@ -224,6 +224,14 @@ spec:
                       type: string
                     type: array
                 type: object
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                description: |-
+                  NodeSelector is a selector which must be true for the Ironic pod to fit on a node.
+                  Selector which must match a node's labels for the vmi to be scheduled on that node.
+                  More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+                type: object
               ramdiskExtraKernelParams:
                 description: |-
                   RamdiskExtraKernelParams is a string with kernel parameters to pass to the provisioning/inspection ramdisk.

pkg/ironic/containers.go

@@ -513,8 +513,9 @@ func newIronicPodTemplate(ironic *metal3api.Ironic, db *metal3api.IronicDatabase
 			InitContainers: initContainers,
 			Volumes:        volumes,
 			// Ironic needs to be accessed by external machines
-			HostNetwork: true,
-			DNSPolicy:   corev1.DNSClusterFirstWithHostNet,
+			HostNetwork:  true,
+			DNSPolicy:    corev1.DNSClusterFirstWithHostNet,
+			NodeSelector: ironic.Spec.NodeSelector,
 		},
 	}, nil
 }