Merge pull request #31 from gianarb/fix/merge-basetags

fix device tags
kubernetes-sigs · May 7, 2020 · aa900b3 · aa900b3
2 parents 0be9274 + da73f9d
commit aa900b3
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 8 deletions.
diff --git a/api/v1alpha3/packetcluster_types.go b/api/v1alpha3/packetcluster_types.go
@@ -32,6 +32,14 @@ type PacketClusterSpec struct {
 	ProjectID string `json:"projectID"`
 }
 
+// APIEndpoint represents a reachable Kubernetes API endpoint.
+type APIEndpoint struct {
+	// The hostname on which the API server is serving.
+	Host string `json:"host"`
+	// The port on which the API server is serving.
+	Port int `json:"port"`
+}
+
 // PacketClusterStatus defines the observed state of PacketCluster
 type PacketClusterStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
@@ -40,6 +48,9 @@ type PacketClusterStatus struct {
 	// Ready denotes that the cluster (infrastructure) is ready.
 	// +optional
 	Ready bool `json:"ready"`
+	// APIEndpoints represents the endpoints to communicate with the control plane.
+	// +optional
+	APIEndpoints []APIEndpoint `json:"apiEndpoints,omitempty"`
 }
 
 // +kubebuilder:subresource:status

diff --git a/api/v1alpha3/zz_generated.deepcopy.go b/api/v1alpha3/zz_generated.deepcopy.go
diff --git a/controllers/packetcluster_controller.go b/controllers/packetcluster_controller.go
@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"time"
 
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
@@ -68,6 +69,14 @@ func (r *PacketClusterReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, re
 		return ctrl.Result{}, err
 	}
 
+	if cluster == nil {
+		logger.Info("OwenerCluster is not set yet. Requeuing...")
+		return ctrl.Result{
+			Requeue:      true,
+			RequeueAfter: 2 * time.Second,
+		}, nil
+	}
+
 	// Create the cluster scope
 	clusterScope, err := scope.NewClusterScope(scope.ClusterScopeParams{
 		Logger:        logger,

diff --git a/controllers/packetmachine_controller.go b/controllers/packetmachine_controller.go
@@ -208,8 +208,9 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
 		} else {
 			tags = append(tags, infrastructurev1alpha3.WorkerTag)
 		}
+
 		name := machineScope.Name()
-		dev, err = r.PacketClient.NewDevice(name, clusterScope.PacketCluster.Spec.ProjectID, machineScope.PacketMachine.Spec)
+		dev, err = r.PacketClient.NewDevice(name, clusterScope.PacketCluster.Spec.ProjectID, machineScope.PacketMachine.Spec, tags)
 		if err != nil {
 			errs := fmt.Errorf("failed to create machine %s: %v", name, err)
 			machineScope.SetErrorReason(capierrors.CreateMachineError)

diff --git a/pkg/cloud/packet/client.go b/pkg/cloud/packet/client.go
@@ -43,15 +43,16 @@ func (p *PacketClient) GetDevice(deviceID string) (*packngo.Device, error) {
 	return dev, err
 }
 
-func (p *PacketClient) NewDevice(hostname, project string, spec infrav1.PacketMachineSpec) (*packngo.Device, error) {
+func (p *PacketClient) NewDevice(hostname, project string, spec infrav1.PacketMachineSpec, extraTags []string) (*packngo.Device, error) {
+	tags := append(spec.Tags, extraTags...)
 	serverCreateOpts := &packngo.DeviceCreateRequest{
 		Hostname:     hostname,
 		ProjectID:    project,
 		Facility:     spec.Facility,
 		BillingCycle: spec.BillingCycle,
 		Plan:         spec.MachineType,
 		OS:           spec.OS,
-		Tags:         spec.Tags,
+		Tags:         tags,
 	}
 
 	dev, _, err := p.Client.Devices.Create(serverCreateOpts)

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -2,7 +2,7 @@
 kind: KubeadmConfig
 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
 metadata:
-  name: my-control-plane1-config
+  name: "${CLUSTER_NAME}-control-plane1-config"
 spec:
   initConfiguration:
     nodeRegistration:
@@ -46,7 +46,7 @@ spec:
     configRef:
       kind: KubeadmConfig
       apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
-      name: my-control-plane1-config
+      name: "${CLUSTER_NAME}-control-plane1-config"
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     kind: PacketMachine
@@ -78,7 +78,7 @@ spec:
     configRef:
       kind: KubeadmConfig
       apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
-      name: my-control-plane1-config
+      name: "${CLUSTER_NAME}-worker0-config"
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     kind: PacketMachine
@@ -110,7 +110,7 @@ spec:
     configRef:
       kind: KubeadmConfig
       apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
-      name: my-control-plane1-config
+      name: "${CLUSTER_NAME}-worker1-config"
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     kind: PacketMachine
@@ -129,3 +129,23 @@ spec:
   sshKeys:
   - "${SSH_KEY}"
   tags: []
+---
+kind: KubeadmConfig
+apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+metadata:
+  name: "${CLUSTER_NAME}-worker1-config"
+spec:
+  joinConfiguration:
+    nodeRegistration:
+      kubeletExtraArgs:
+        eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+---
+kind: KubeadmConfig
+apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+metadata:
+  name: "${CLUSTER_NAME}-worker0-config"
+spec:
+  joinConfiguration:
+    nodeRegistration:
+      kubeletExtraArgs:
+        eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%