Add version information for all the components in machine spec

cmd/cluster.go

@@ -105,7 +105,7 @@ func createCluster(clusterName, podsCIDR, servicesCIDR, vip string, routerID int
 			APIEndpoints: []clusterv1.APIEndpoint{
 				clusterv1.APIEndpoint{
 					Host: vip,
-					Port: common.DEFAULT_APISERVER_PORT,
+					Port: common.DefaultApiserverPort,
 				},
 			},
 		},

cmd/machine.go

@@ -232,6 +232,15 @@ func newProvisionedMachineAndMachine(name string, role clustercommon.MachineRole
 		Roles: []spv1.MachineRole{
 			spv1.MachineRole(role),
 		},
+		ComponentVersions: &spv1.MachineComponentVersions{
+			NodeadmVersion:    common.DefaultNodeadmVersion,
+			EtcdadmVersion:    common.DefaultEtcdadmVersion,
+			KubernetesVersion: common.DefaultKubernetesVersion,
+			CNIVersion:        common.DefaultCNIVersion,
+			KeepalivedVersion: common.DefaultKeepalivedVersion,
+			FlannelVersion:    common.DefaultFlannelVersion,
+			EtcdVersion:       common.DefaultEtcdVersion,
+		},
 	}
 	if err := sputil.PutMachineSpec(machineProviderSpec, &newMachine); err != nil {
 		return nil, nil, fmt.Errorf("unable to encode machine provider spec: %v", err)
@@ -612,8 +621,8 @@ func init() {
 	deleteCmd.AddCommand(machineCmdDelete)
 	machineCmdDelete.Flags().String("ip", "", "IP of the machine")
 	machineCmdDelete.Flags().String("force", "", "Force delete the machine")
-	machineCmdDelete.Flags().DurationVar(&drainTimeout, "drain-timeout", common.DRAIN_TIMEOUT, "The length of time to wait before giving up, zero means infinite")
-	machineCmdDelete.Flags().IntVar(&drainGracePeriodSeconds, "drain-graceperiod", common.DRAIN_GRACE_PERIOD_SECONDS, "Period of time in seconds given to each pod to terminate gracefully. If negative, the default value specified in the pod will be used.")
+	machineCmdDelete.Flags().DurationVar(&drainTimeout, "drain-timeout", common.DrainTimeout, "The length of time to wait before giving up, zero means infinite")
+	machineCmdDelete.Flags().IntVar(&drainGracePeriodSeconds, "drain-graceperiod", common.DrainGracePeriodSeconds, "Period of time in seconds given to each pod to terminate gracefully. If negative, the default value specified in the pod will be used.")
 
 	machineCmdGet.Flags().String("ip", "", "IP of the machine")
 	getCmd.AddCommand(machineCmdGet)

common/constants.go

@@ -3,14 +3,11 @@ package common
 import "time"
 
 const (
-	K8S_VERSION                = "1.10.4"
-	DEFAULT_APISERVER_PORT     = 6443
-	DRAIN_TIMEOUT              = 5 * time.Minute
-	DRAIN_GRACE_PERIOD_SECONDS = -1
-
-	MasterRole = "master"
-	NodeRole   = "node"
-
+	DefaultApiserverPort               = 6443
+	DrainTimeout                       = 5 * time.Minute
+	DrainGracePeriodSeconds            = -1
+	MasterRole                         = "master"
+	NodeRole                           = "node"
 	DefaultSSHPort                     = 22
 	DefaultNamespace                   = "default"
 	DefaultClusterName                 = "cctl-cluster"
@@ -21,13 +18,18 @@ const (
 	DefaultFrontProxyCASecretName      = "front-proxy-ca"
 	DefaultServiceAccountKeySecretName = "serviceaccount-key"
 	DefaultBootstrapTokenSecretName    = "bootstrap-token"
-
-	SystemUUIDFile    = "/sys/class/dmi/id/product_uuid"
-	KubectlFile       = "/opt/bin/kubectl"
-	AdminKubeconfig   = "/etc/kubernetes/admin.conf"
-	KubeletKubeconfig = "/etc/kubernetes/kubelet.conf"
-
-	ClusterV1PrintTemplate = `Cluster Information
+	SystemUUIDFile                     = "/sys/class/dmi/id/product_uuid"
+	KubectlFile                        = "/opt/bin/kubectl"
+	AdminKubeconfig                    = "/etc/kubernetes/admin.conf"
+	KubeletKubeconfig                  = "/etc/kubernetes/kubelet.conf"
+	DefaultNodeadmVersion              = "v0.0.1-alpha"
+	DefaultEtcdadmVersion              = "v0.0.1-alpha"
+	DefaultKubernetesVersion           = "1.10.4"
+	DefaultCNIVersion                  = "v0.6.0"
+	DefaultFlannelVersion              = "v0.10.0"
+	DefaultKeepalivedVersion           = "v2.0.4"
+	DefaultEtcdVersion                 = "v3.3.8"
+	ClusterV1PrintTemplate             = `Cluster Information
 ------- ------------
 Cluster Name       : {{ .Cluster.ObjectMeta.Name}}
 Creation Timestamp : {{ .Cluster.ObjectMeta.CreationTimestamp }}