Convert machineSpec.Versions to a pointer

kubernetes-sigs · Jan 16, 2019 · e5bddcc · e5bddcc
1 parent 750b022
commit e5bddcc
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/cmd/clusterctl/clusterdeployer/clusterdeployer_test.go b/cmd/clusterctl/clusterdeployer/clusterdeployer_test.go
@@ -1193,7 +1193,7 @@ func generateTestMasterMachine(name string) *clusterv1.Machine {
 			Name: name,
 		},
 		Spec: clusterv1.MachineSpec{
-			Versions: clusterv1.MachineVersionInfo{
+			Versions: &clusterv1.MachineVersionInfo{
 				ControlPlane: "1.10.1",
 			},
 		},

diff --git a/pkg/apis/cluster/v1alpha1/machine_types.go b/pkg/apis/cluster/v1alpha1/machine_types.go
@@ -70,7 +70,7 @@ type MachineSpec struct {
 	// should populate the values it uses when persisting Machine objects.
 	// A Machine spec missing this field at runtime is invalid.
 	// +optional
-	Versions MachineVersionInfo `json:"versions,omitempty"`
+	Versions *MachineVersionInfo `json:"versions,omitempty"`
 
 	// To populate in the associated Node for dynamic kubelet config. This
 	// field already exists in Node, so any updates to it in the Machine

diff --git a/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controller/machine/machine_controller_test.go b/pkg/controller/machine/machine_controller_test.go
@@ -39,7 +39,7 @@ func TestReconcile(t *testing.T) {
 	instance := &clusterv1alpha1.Machine{
 		ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default"},
 		Spec: clusterv1alpha1.MachineSpec{
-			Versions: clusterv1alpha1.MachineVersionInfo{Kubelet: "1.10.3"},
+			Versions: &clusterv1alpha1.MachineVersionInfo{Kubelet: "1.10.3"},
 		},
 	}
 

diff --git a/pkg/controller/machinedeployment/machinedeployment_controller_test.go b/pkg/controller/machinedeployment/machinedeployment_controller_test.go
@@ -59,7 +59,7 @@ func TestReconcile(t *testing.T) {
 					Labels: labels,
 				},
 				Spec: clusterv1alpha1.MachineSpec{
-					Versions: clusterv1alpha1.MachineVersionInfo{Kubelet: "1.10.3"},
+					Versions: &clusterv1alpha1.MachineVersionInfo{Kubelet: "1.10.3"},
 				},
 			},
 		},

diff --git a/pkg/controller/machineset/machineset_controller_test.go b/pkg/controller/machineset/machineset_controller_test.go
@@ -43,7 +43,7 @@ func TestReconcile(t *testing.T) {
 			Replicas: &replicas,
 			Template: clusterv1alpha1.MachineTemplateSpec{
 				Spec: clusterv1alpha1.MachineSpec{
-					Versions: clusterv1alpha1.MachineVersionInfo{Kubelet: "1.10.3"},
+					Versions: &clusterv1alpha1.MachineVersionInfo{Kubelet: "1.10.3"},
 				},
 			},
 		},

diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -27,7 +27,7 @@ import (
 	"strings"
 	"time"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/klog"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
@@ -118,7 +118,10 @@ func GetMachineIfExists(c client.Client, namespace, name string) (*clusterv1.Mac
 
 // TODO(robertbailey): Remove this function
 func IsMaster(machine *clusterv1.Machine) bool {
-	return machine.Spec.Versions.ControlPlane != ""
+	if machine.Spec.Versions != nil {
+		return machine.Spec.Versions.ControlPlane != ""
+	}
+	return false
 }
 
 func IsNodeReady(node *v1.Node) bool {