Merge pull request #140 from gianarb/feature/move-facility-to-cluster

Move facility from packetmachine to packetcluster

Author: gianarb

api/v1alpha3/packetcluster_types.go

@@ -29,9 +29,12 @@ type PacketClusterSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	// Foo is an example field of PacketCluster. Edit PacketCluster_types.go to remove/update
+	// ProjectID represents the Packet Project where this cluster will be placed into
 	ProjectID string `json:"projectID"`
 
+	// Facility represents the Packet facility for this cluster
+	Facility string `json:"facility,omitempty"`
+
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`

api/v1alpha3/packetmachine_types.go

@@ -33,10 +33,6 @@ const (
 
 // PacketMachineSpec defines the desired state of PacketMachine
 type PacketMachineSpec struct {
-	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
-
-	Facility     []string `json:"facility,omitempty"`
 	OS           string   `json:"OS"`
 	BillingCycle string   `json:"billingCycle"`
 	MachineType  string   `json:"machineType"`

api/v1alpha3/zz_generated.deepcopy.go

@@ -0,0 +1,74 @@
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  creationTimestamp: null
+  name: manager-role
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - clusters
+  - clusters/status
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machines
+  - machines/status
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - packetclusters
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - packetclusters/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - packetmachines
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - packetmachines/status
+  verbs:
+  - get
+  - patch
+  - update

config/rbac/role.yaml

@@ -51,9 +51,12 @@ spec:
               - host
               - port
               type: object
+            facility:
+              description: Facility represents the Packet facility for this cluster
+              type: string
             projectID:
-              description: Foo is an example field of PacketCluster. Edit PacketCluster_types.go
-                to remove/update
+              description: ProjectID represents the Packet Project where this cluster
+                will be placed into
               type: string
           required:
           - projectID

config/resources/crd/bases/infrastructure.cluster.x-k8s.io_packetclusters.yaml

@@ -63,10 +63,6 @@ spec:
               type: string
             billingCycle:
               type: string
-            facility:
-              items:
-                type: string
-              type: array
             hardwareReservationID:
               description: HardwareReservationID is the unique device hardware reservation
                 ID or `next-available` to automatically let the Packet api determine

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

@@ -49,10 +49,6 @@ spec:
                       type: string
                     billingCycle:
                       type: string
-                    facility:
-                      items:
-                        type: string
-                      type: array
                     hardwareReservationID:
                       description: HardwareReservationID is the unique device hardware
                         reservation ID or `next-available` to automatically let the

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

@@ -90,7 +90,7 @@ func (p *PacketClient) NewDevice(hostname, project string, machineScope *scope.M
 	serverCreateOpts := &packngo.DeviceCreateRequest{
 		Hostname:              hostname,
 		ProjectID:             project,
-		Facility:              machineScope.PacketMachine.Spec.Facility,
+		Facility:              []string{machineScope.PacketCluster.Spec.Facility},
 		BillingCycle:          machineScope.PacketMachine.Spec.BillingCycle,
 		HardwareReservationID: machineScope.PacketMachine.Spec.HardwareReservationID,
 		Plan:                  machineScope.PacketMachine.Spec.MachineType,

pkg/cloud/packet/client.go

@@ -49,6 +49,7 @@ metadata:
   name: "${CLUSTER_NAME}"
 spec:
   projectID: "${PROJECT_ID}"
+  facility: "${FACILITY}"
 ---
 apiVersion: cluster.x-k8s.io/v1alpha3
 kind: Machine
@@ -75,8 +76,6 @@ metadata:
   name: "${CLUSTER_NAME}-master-0"
 spec:
   OS: "${NODE_OS}"
-  facility:
-  - "${FACILITY}"
   billingCycle: hourly
   machineType: "${MASTER_NODE_TYPE}"
   sshKeys:
@@ -123,8 +122,6 @@ spec:
   template:
     spec:
       OS: "${NODE_OS}"
-      facility:
-      - "${FACILITY}"
       billingCycle: hourly
       machineType: "${WORKER_NODE_TYPE}"
       sshKeys: