Deploy new VM images for MacStadium Kubernetes nodes

We don't want to replace the master because it's not under disk pressure
and we would lose the existing configuration. So now nodes and master
can have different VM templates.

Nodes now use a CentOS 7 template with Kubernetes already installed
during the Packer build, so the provisioning is substantially simpler.

Author: mjm

macstadium-staging/main.tf

@@ -25,6 +25,8 @@ provider "aws" {
 }
 
 provider "vsphere" {
+  version = "~> 1.8"
+
   user                 = "${var.vsphere_user}"
   password             = "${var.vsphere_password}"
   vsphere_server       = "${var.vsphere_server}"

modules/macstadium_k8s_cluster/master.tf

@@ -11,22 +11,22 @@ resource "vsphere_virtual_machine" "master" {
 
   num_cpus  = 4
   memory    = 4096
-  guest_id  = "${data.vsphere_virtual_machine.vanilla_template.guest_id}"
-  scsi_type = "${data.vsphere_virtual_machine.vanilla_template.scsi_type}"
+  guest_id  = "${data.vsphere_virtual_machine.master_vanilla_template.guest_id}"
+  scsi_type = "${data.vsphere_virtual_machine.master_vanilla_template.scsi_type}"
 
   disk {
     label            = "disk0"
-    size             = "${data.vsphere_virtual_machine.vanilla_template.disks.0.size}"
-    eagerly_scrub    = "${data.vsphere_virtual_machine.vanilla_template.disks.0.eagerly_scrub}"
-    thin_provisioned = "${data.vsphere_virtual_machine.vanilla_template.disks.0.thin_provisioned}"
+    size             = "${data.vsphere_virtual_machine.master_vanilla_template.disks.0.size}"
+    eagerly_scrub    = "${data.vsphere_virtual_machine.master_vanilla_template.disks.0.eagerly_scrub}"
+    thin_provisioned = "${data.vsphere_virtual_machine.master_vanilla_template.disks.0.thin_provisioned}"
   }
 
   network_interface {
     network_id = "${data.vsphere_network.internal.id}"
   }
 
   clone {
-    template_uuid = "${data.vsphere_virtual_machine.vanilla_template.id}"
+    template_uuid = "${data.vsphere_virtual_machine.master_vanilla_template.id}"
 
     customize {
       network_interface {

modules/macstadium_k8s_cluster/nodes.tf

@@ -14,14 +14,14 @@ resource "vsphere_virtual_machine" "nodes" {
 
   num_cpus  = 4
   memory    = 4096
-  guest_id  = "${data.vsphere_virtual_machine.vanilla_template.guest_id}"
-  scsi_type = "${data.vsphere_virtual_machine.vanilla_template.scsi_type}"
+  guest_id  = "${data.vsphere_virtual_machine.node_vanilla_template.guest_id}"
+  scsi_type = "${data.vsphere_virtual_machine.node_vanilla_template.scsi_type}"
 
   disk {
     label            = "disk0"
-    size             = "${data.vsphere_virtual_machine.vanilla_template.disks.0.size}"
-    eagerly_scrub    = "${data.vsphere_virtual_machine.vanilla_template.disks.0.eagerly_scrub}"
-    thin_provisioned = "${data.vsphere_virtual_machine.vanilla_template.disks.0.thin_provisioned}"
+    size             = "${data.vsphere_virtual_machine.node_vanilla_template.disks.0.size}"
+    eagerly_scrub    = "${data.vsphere_virtual_machine.node_vanilla_template.disks.0.eagerly_scrub}"
+    thin_provisioned = "${data.vsphere_virtual_machine.node_vanilla_template.disks.0.thin_provisioned}"
   }
 
   network_interface {
@@ -35,7 +35,7 @@ resource "vsphere_virtual_machine" "nodes" {
   }
 
   clone {
-    template_uuid = "${data.vsphere_virtual_machine.vanilla_template.id}"
+    template_uuid = "${data.vsphere_virtual_machine.node_vanilla_template.id}"
 
     customize {
       network_interface {
@@ -67,16 +67,8 @@ resource "vsphere_virtual_machine" "nodes" {
     agent = true
   }
 
-  provisioner "file" {
-    source      = "${path.module}/scripts/"
-    destination = "/tmp"
-  }
-
   provisioner "remote-exec" {
     inline = [
-      "sudo chmod a+x /tmp/*.sh",
-      "sudo /tmp/install-docker.sh",
-      "sudo /tmp/install-kubernetes.sh",
       "sudo ${lookup(data.external.kubeadm_join.result, "command")}",
     ]
   }

modules/macstadium_k8s_cluster/providers.tf

@@ -29,7 +29,12 @@ data "vsphere_network" "management" {
 }
 */
 
-data "vsphere_virtual_machine" "vanilla_template" {
-  name          = "Vanilla VMs/${var.vanilla_image}"
+data "vsphere_virtual_machine" "master_vanilla_template" {
+  name          = "Vanilla VMs/${var.master_vanilla_image}"
+  datacenter_id = "${data.vsphere_datacenter.dc.id}"
+}
+
+data "vsphere_virtual_machine" "node_vanilla_template" {
+  name          = "Vanilla VMs/${var.node_vanilla_image}"
   datacenter_id = "${data.vsphere_datacenter.dc.id}"
 }

modules/macstadium_k8s_cluster/variables.tf

@@ -14,9 +14,14 @@ variable "node_count" {
   default = 1
 }
 
-variable "vanilla_image" {
+variable "master_vanilla_image" {
   default     = "travis-ci-ubuntu16.04-internal-vanilla-1540931726"
-  description = "The image to clone VMs from. Needs to be at least Xenial to support Kubernetes."
+  description = "The image to clone the master VM from. Needs to be at least Xenial to support Kubernetes."
+}
+
+variable "node_vanilla_image" {
+  default     = "travis-ci-centos7-internal-kubernetes-1549480185"
+  description = "The image to clone node VMs from. It should already have Kubernetes installed."
 }
 
 variable "datacenter" {