Update to latest version (#325)

* Build now functional

* Use ssh option to reduce questions

* Use IPVS

* Further e2e observations

* Tidy up

* RAM and CPU adjustments

vagrant/Vagrantfile

@@ -1,15 +1,42 @@
 # -*- mode: ruby -*-
 # vi:set ft=ruby sw=2 ts=2 sts=2:
 
-# Define the number of master and worker nodes
-# If this number is changed, remember to update setup-hosts.sh script with the new hosts IP details in /etc/hosts of each VM.
-NUM_MASTER_NODE = 2
-NUM_WORKER_NODE = 2
+# Define how much memory your computer has in GB (e.g. 8, 16)
+# Larger nodes will be created if you have more.
+RAM_SIZE = 16
 
+# Define how mnay CPU cores you have.
+# More powerful workers will be created if you have more
+CPU_CORES = 8
+
+# Internal network prefix for the VM network
+# See the documentation before changing this
 IP_NW = "192.168.56."
-MASTER_IP_START = 10
-NODE_IP_START = 20
-LB_IP_START = 30
+
+# Calculate resource amounts
+# based on RAM/CPU
+ram_selector = (RAM_SIZE / 4) * 4
+if ram_selector < 8
+  raise "Unsufficient memory #{RAM_SIZE}GB. min 8GB"
+end
+RESOURCES = {
+  "master" => {
+    1 => {
+      # master-1 bigger since it may run e2e tests.
+      "ram" => [ram_selector * 128, 2048].max(),
+      "cpu" => CPU_CORES >= 12 ? 4 : 2,
+    },
+    2 => {
+      # All additional masters get this
+      "ram" => [ram_selector * 128, 2048].min(),
+      "cpu" => CPU_CORES > 8 ? 2 : 1,
+    },
+  },
+  "worker" => {
+    "ram" => [ram_selector * 128, 4096].min(),
+    "cpu" => (((CPU_CORES / 4) * 4) - 4) / 4,
+  },
+}
 
 # Sets up hosts file and DNS
 def setup_dns(node)
@@ -25,18 +52,23 @@ end
 def provision_kubernetes_node(node)
   # Set up kernel parameters, modules and tunables
   node.vm.provision "setup-kernel", :type => "shell", :path => "ubuntu/setup-kernel.sh"
-  # Restart
-  node.vm.provision :shell do |shell|
-    shell.privileged = true
-    shell.inline = "echo Rebooting"
-    shell.reboot = true
-  end
+  # Set up ssh
+  node.vm.provision "setup-ssh", :type => "shell", :path => "ubuntu/ssh.sh"
   # Set up DNS
   setup_dns node
   # Install cert verification script
   node.vm.provision "shell", inline: "ln -s /vagrant/ubuntu/cert_verify.sh /home/vagrant/cert_verify.sh"
 end
 
+# Define the number of master and worker nodes. You should not change this
+NUM_MASTER_NODE = 2
+NUM_WORKER_NODE = 2
+
+# Host address start points
+MASTER_IP_START = 10
+NODE_IP_START = 20
+LB_IP_START = 30
+
 # All Vagrant configuration is done below. The "2" in Vagrant.configure
 # configures the configuration version (we support older styles for
 # backwards compatibility). Please don't change it unless you know what
@@ -50,6 +82,7 @@ Vagrant.configure("2") do |config|
   # boxes at https://vagrantcloud.com/search.
   # config.vm.box = "base"
   config.vm.box = "ubuntu/jammy64"
+  config.vm.boot_timeout = 900
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
@@ -62,12 +95,8 @@ Vagrant.configure("2") do |config|
       # Name shown in the GUI
       node.vm.provider "virtualbox" do |vb|
         vb.name = "kubernetes-ha-master-#{i}"
-        if i == 1
-          vb.memory = 2048    # More needed to run e2e tests at end
-        else
-          vb.memory = 1024
-        end
-        vb.cpus = 2
+        vb.memory = RESOURCES["master"][i > 2 ? 2 : i]["ram"]
+        vb.cpus = RESOURCES["master"][i > 2 ? 2 : i]["cpu"]
       end
       node.vm.hostname = "master-#{i}"
       node.vm.network :private_network, ip: IP_NW + "#{MASTER_IP_START + i}"
@@ -91,6 +120,8 @@ Vagrant.configure("2") do |config|
     node.vm.hostname = "loadbalancer"
     node.vm.network :private_network, ip: IP_NW + "#{LB_IP_START}"
     node.vm.network "forwarded_port", guest: 22, host: 2730
+    # Set up ssh
+    node.vm.provision "setup-ssh", :type => "shell", :path => "ubuntu/ssh.sh"
     setup_dns node
   end
 
@@ -99,8 +130,8 @@ Vagrant.configure("2") do |config|
     config.vm.define "worker-#{i}" do |node|
       node.vm.provider "virtualbox" do |vb|
         vb.name = "kubernetes-ha-worker-#{i}"
-        vb.memory = 1024
-        vb.cpus = 1
+        vb.memory = RESOURCES["worker"]["ram"]
+        vb.cpus = RESOURCES["worker"]["cpu"]
       end
       node.vm.hostname = "worker-#{i}"
       node.vm.network :private_network, ip: IP_NW + "#{NODE_IP_START + i}"