add support for metros

moadqassem · cprivitere · commit 44ca7d93fdb2 · 2023-04-06T15:42:25.000-05:00
Signed-off-by: Moath Qasim &lt;moad.qassem@gmail.com&gt;
diff --git a/api/v1alpha3/packetcluster_types.go b/api/v1alpha3/packetcluster_types.go
@@ -32,6 +32,10 @@ type PacketClusterSpec struct {
 	// Facility represents the Packet facility for this cluster
 	Facility string `json:"facility,omitempty"`
 
+	// Metro represents the Packet metro for this cluster
+	// +optional
+	Metro string `json:"metro,omitempty"`
+
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
diff --git a/api/v1alpha3/packetmachine_types.go b/api/v1alpha3/packetmachine_types.go
@@ -40,6 +40,10 @@ type PacketMachineSpec struct {
 	// +optional
 	Facility string `json:"facility,omitempty"`
 
+	// Metro represents the Packet metro for this cluster
+	// +optional
+	Metro string `json:"metro,omitempty"`
+
 	// IPXEUrl can be used to set the pxe boot url when using custom OSes with this provider.
 	// Note that OS should also be set to "custom_ipxe" if using this value.
 	// +optional
diff --git a/api/v1alpha3/zz_generated.conversion.go b/api/v1alpha3/zz_generated.conversion.go
diff --git a/api/v1beta1/packetcluster_types.go b/api/v1beta1/packetcluster_types.go
@@ -37,6 +37,10 @@ type PacketClusterSpec struct {
 	// Facility represents the Packet facility for this cluster
 	Facility string `json:"facility,omitempty"`
 
+	// Metro represents the Packet metro for this cluster
+	// +optional
+	Metro string `json:"metro,omitempty"`
+
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
diff --git a/api/v1beta1/packetcluster_webhook.go b/api/v1beta1/packetcluster_webhook.go
@@ -71,6 +71,13 @@ func (c *PacketCluster) ValidateUpdate(oldRaw runtime.Object) error {
 		)
 	}
 
+	if !reflect.DeepEqual(c.Spec.Metro, old.Spec.Metro) {
+		allErrs = append(allErrs,
+			field.Invalid(field.NewPath("spec", "Metro"),
+				c.Spec.Metro, "field is immutable"),
+		)
+	}
+
 	if !reflect.DeepEqual(c.Spec.VIPManager, old.Spec.VIPManager) {
 		allErrs = append(allErrs,
 			field.Invalid(field.NewPath("spec", "VIPManager"),
diff --git a/api/v1beta1/packetmachine_types.go b/api/v1beta1/packetmachine_types.go
@@ -63,6 +63,10 @@ type PacketMachineSpec struct {
 	// +optional
 	Facility string `json:"facility,omitempty"`
 
+	// Metro represents the Packet metro for this cluster
+	// +optional
+	Metro string `json:"metro,omitempty"`
+
 	// IPXEUrl can be used to set the pxe boot url when using custom OSes with this provider.
 	// Note that OS should also be set to "custom_ipxe" if using this value.
 	// +optional
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_packetclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_packetclusters.yaml
@@ -64,6 +64,9 @@ spec:
               facility:
                 description: Facility represents the Packet facility for this cluster
                 type: string
+              metro:
+                description: Metro represents the Packet metro for this cluster
+                type: string
               projectID:
                 description: ProjectID represents the Packet Project where this cluster
                   will be placed into
@@ -139,6 +142,9 @@ spec:
               facility:
                 description: Facility represents the Packet facility for this cluster
                 type: string
+              metro:
+                description: Metro represents the Packet metro for this cluster
+                type: string
               projectID:
                 description: ProjectID represents the Packet Project where this cluster
                   will be placed into
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_packetmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_packetmachines.yaml
@@ -78,6 +78,9 @@ spec:
                 type: string
               machineType:
                 type: string
+              metro:
+                description: Metro represents the Packet metro for this cluster
+                type: string
               providerID:
                 description: ProviderID is the unique identifier as specified by the
                   cloud provider.
@@ -209,6 +212,9 @@ spec:
                 type: string
               machineType:
                 type: string
+              metro:
+                description: Metro represents the Packet metro for this cluster
+                type: string
               os:
                 type: string
               providerID:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_packetmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_packetmachinetemplates.yaml
@@ -67,6 +67,9 @@ spec:
                         type: string
                       machineType:
                         type: string
+                      metro:
+                        description: Metro represents the Packet metro for this cluster
+                        type: string
                       providerID:
                         description: ProviderID is the unique identifier as specified
                           by the cloud provider.
@@ -143,6 +146,9 @@ spec:
                         type: string
                       machineType:
                         type: string
+                      metro:
+                        description: Metro represents the Packet metro for this cluster
+                        type: string
                       os:
                         type: string
                       providerID:
diff --git a/controllers/packetcluster_controller.go b/controllers/packetcluster_controller.go
@@ -117,7 +117,7 @@ func (r *PacketClusterReconciler) reconcileNormal(ctx context.Context, clusterSc
 	switch {
 	case errors.Is(err, packet.ErrControlPlanEndpointNotFound):
 		// There is not an ElasticIP with the right tags, at this point we can create one
-		ip, err := r.PacketClient.CreateIP(clusterScope.Namespace(), clusterScope.Name(), packetCluster.Spec.ProjectID, packetCluster.Spec.Facility)
+		ip, err := r.PacketClient.CreateIP(clusterScope.Namespace(), clusterScope.Name(), packetCluster.Spec.ProjectID, packetCluster.Spec.Facility, packetCluster.Spec.Metro)
 		if err != nil {
 			log.Error(err, "error reserving an ip")
 			return ctrl.Result{}, err
diff --git a/pkg/cloud/packet/client.go b/pkg/cloud/packet/client.go
@@ -144,10 +144,17 @@ func (p *Client) NewDevice(ctx context.Context, req CreateDeviceRequest) (*packn
 		facility = req.MachineScope.PacketMachine.Spec.Facility
 	}
 
+	// Allow to override the metro for each PacketMachineTemplate
+	metro := req.MachineScope.PacketCluster.Spec.Metro
+	if req.MachineScope.PacketMachine.Spec.Metro != "" {
+		metro = req.MachineScope.PacketMachine.Spec.Metro
+	}
+
 	serverCreateOpts := &packngo.DeviceCreateRequest{
 		Hostname:      req.MachineScope.Name(),
 		ProjectID:     req.MachineScope.PacketCluster.Spec.ProjectID,
 		Facility:      []string{facility},
+		Metro:         metro,
 		BillingCycle:  req.MachineScope.PacketMachine.Spec.BillingCycle,
 		Plan:          req.MachineScope.PacketMachine.Spec.MachineType,
 		OS:            req.MachineScope.PacketMachine.Spec.OS,
@@ -215,11 +222,12 @@ func (p *Client) GetDeviceByTags(project string, tags []string) (*packngo.Device
 
 // CreateIP reserves an IP via Packet API. The request fails straight if no IP are available for the specified project.
 // This prevent the cluster to become ready.
-func (p *Client) CreateIP(namespace, clusterName, projectID, facility string) (net.IP, error) {
+func (p *Client) CreateIP(namespace, clusterName, projectID, facility, metro string) (net.IP, error) {
 	req := packngo.IPReservationRequest{
 		Type:                   packngo.PublicIPv4,
 		Quantity:               1,
 		Facility:               &facility,
+		Metro:                  &metro,
 		FailOnApprovalRequired: true,
 		Tags:                   []string{generateElasticIPIdentifier(clusterName)},
 	}

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,13 @@ func (c *PacketCluster) ValidateUpdate(oldRaw runtime.Object) error {`
`71`	`71`	`)`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ if !reflect.DeepEqual(c.Spec.Metro, old.Spec.Metro) {`
	`75`	`+ allErrs = append(allErrs,`
	`76`	`+ field.Invalid(field.NewPath("spec", "Metro"),`
	`77`	`+ c.Spec.Metro, "field is immutable"),`
	`78`	`+ )`
	`79`	`+ }`
	`80`	`+`
`74`	`81`	`if !reflect.DeepEqual(c.Spec.VIPManager, old.Spec.VIPManager) {`
`75`	`82`	`allErrs = append(allErrs,`
`76`	`83`	`field.Invalid(field.NewPath("spec", "VIPManager"),`