✨ Make IP addresses of PacketMachine(Template) configurable

api/v1beta1/packetmachine_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
+	"github.com/packethost/packngo"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -51,6 +52,29 @@ const (
 	WaitingForBootstrapDataReason = "WaitingForBootstrapData"
 )
 
+// +kubebuilder:object:generate=false
+type IPAddressCreateRequest struct {
+	packngo.IPAddressCreateRequest `json:"ipAddressCreateRequest"`
+}
+
+func (in *IPAddressCreateRequest) DeepCopyInto(out *IPAddressCreateRequest) {
+	*out = *in
+	if in.Reservations != nil {
+		in, out := &in.IPAddressCreateRequest.Reservations, &out.IPAddressCreateRequest.Reservations
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+}
+
+func (in *IPAddressCreateRequest) DeepCopy() *IPAddressCreateRequest {
+	if in == nil {
+		return nil
+	}
+	out := new(IPAddressCreateRequest)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // PacketMachineSpec defines the desired state of PacketMachine
 type PacketMachineSpec struct {
 	OS           string   `json:"os"`
@@ -80,6 +104,11 @@ type PacketMachineSpec struct {
 	// Tags is an optional set of tags to add to Packet resources managed by the Packet provider.
 	// +optional
 	Tags Tags `json:"tags,omitempty"`
+
+	// Optional IP Address list to use when default (1 private IPv4, 1 public IPv4 and 1 public IPv6)
+	// is not desired
+	// +optional
+	IPAddresses []IPAddressCreateRequest `json:"ipAddresses,omitempty"`
 }
 
 // PacketMachineStatus defines the observed state of PacketMachine

config/crd/bases/infrastructure.cluster.x-k8s.io_packetmachines.yaml

@@ -202,6 +202,37 @@ spec:
                   ID, a comma separated list of hardware reservation IDs, or `next-available`
                   to automatically let the Packet api determine one.
                 type: string
+              ipAddresses:
+                description: Optional IP Address list to use when default (1 private
+                  IPv4, 1 public IPv4 and 1 public IPv6) is not desired
+                items:
+                  properties:
+                    ipAddressCreateRequest:
+                      properties:
+                        address_family:
+                          description: Address Family for IP Address
+                          type: integer
+                        cidr:
+                          description: CIDR Size for the IP Block created. Valid values
+                            depends on the operating system provisioned.
+                          type: integer
+                        ip_reservations:
+                          description: Reservations are UUIDs of any IP reservations
+                            to use when assigning IPs
+                          items:
+                            type: string
+                          type: array
+                        public:
+                          description: Address Type for IP Address
+                          type: boolean
+                      required:
+                      - address_family
+                      - public
+                      type: object
+                  required:
+                  - ipAddressCreateRequest
+                  type: object
+                type: array
               ipxeURL:
                 description: IPXEUrl can be used to set the pxe boot url when using
                   custom OSes with this provider. Note that OS should also be set

config/crd/bases/infrastructure.cluster.x-k8s.io_packetmachinetemplates.yaml

@@ -136,6 +136,38 @@ spec:
                           IDs, or `next-available` to automatically let the Packet
                           api determine one.
                         type: string
+                      ipAddresses:
+                        description: Optional IP Address list to use when default
+                          (1 private IPv4, 1 public IPv4 and 1 public IPv6) is not
+                          desired
+                        items:
+                          properties:
+                            ipAddressCreateRequest:
+                              properties:
+                                address_family:
+                                  description: Address Family for IP Address
+                                  type: integer
+                                cidr:
+                                  description: CIDR Size for the IP Block created.
+                                    Valid values depends on the operating system provisioned.
+                                  type: integer
+                                ip_reservations:
+                                  description: Reservations are UUIDs of any IP reservations
+                                    to use when assigning IPs
+                                  items:
+                                    type: string
+                                  type: array
+                                public:
+                                  description: Address Type for IP Address
+                                  type: boolean
+                              required:
+                              - address_family
+                              - public
+                              type: object
+                          required:
+                          - ipAddressCreateRequest
+                          type: object
+                        type: array
                       ipxeURL:
                         description: IPXEUrl can be used to set the pxe boot url when
                           using custom OSes with this provider. Note that OS should

pkg/cloud/packet/client.go

@@ -144,6 +144,11 @@ func (p *Client) NewDevice(ctx context.Context, req CreateDeviceRequest) (*packn
 		facility = req.MachineScope.PacketMachine.Spec.Facility
 	}
 
+	ipAddressCreateRequests := []packngo.IPAddressCreateRequest{}
+	for _, machine := range req.MachineScope.PacketMachine.Spec.IPAddresses {
+		ipAddressCreateRequests = append(ipAddressCreateRequests, machine.IPAddressCreateRequest)
+	}
+
 	serverCreateOpts := &packngo.DeviceCreateRequest{
 		Hostname:      req.MachineScope.Name(),
 		ProjectID:     req.MachineScope.PacketCluster.Spec.ProjectID,
@@ -154,6 +159,7 @@ func (p *Client) NewDevice(ctx context.Context, req CreateDeviceRequest) (*packn
 		IPXEScriptURL: req.MachineScope.PacketMachine.Spec.IPXEUrl,
 		Tags:          tags,
 		UserData:      userData,
+		IPAddresses:   ipAddressCreateRequests,
 	}
 
 	reservationIDs := strings.Split(req.MachineScope.PacketMachine.Spec.HardwareReservationID, ",")