Updates to 1.15

Author: PatrickLang

Vagrantfile

@@ -73,7 +73,7 @@ Vagrant.configure("2") do |config|
 
 
   config.vm.define "win1" do |win1|
-    win1.vm.box = "WindowsServer2019Docker"
+    win1.vm.box = "WindowsServer2019Docker-Jul19"
     win1.vm.provider "hyperv" do |hv|
       hv.vmname = "K8s-win1"
       hv.memory = 4096
@@ -84,7 +84,7 @@ Vagrant.configure("2") do |config|
 
     win1.vm.network "public_network", bridge: "Default Switch"
     win1.vm.hostname = "win1"
-    win1.vm.provision "shell", path: "install-k8s.ps1"
+    # win1.vm.provision "shell", path: "install-k8s.ps1"
     # win1.vm.provision "shell", path: "install-flannel.ps1"
     # win1.vm.provision "shell", path: "join-cluster.ps1"
   end

disable-swap.sh

@@ -1,2 +1,2 @@
-sudo swapoff /swapfile
-sudo rm /swapfile
+sudo swapoff -a
+# TODO remove partition from fstab, devicemapper

install-k8s.ps1

@@ -1,6 +1,6 @@
 # Use a release number from https://github.com/kubernetes/kubernetes/releases/
-$kubernetesVersion = "v1.14.2"
-$kubeadmVersion = "v1.15.0-beta.1"
+$kubernetesVersion = "v1.15.1"
+$kubeadmVersion = "v1.15.1"
 
 $nodeUrl = "https://dl.k8s.io/$kubernetesVersion/kubernetes-node-windows-amd64.tar.gz" # kubelet, kube-proxy, kubectl, kubeadm
 # $clientUrl = "https://dl.k8s.io/$kubernetesVersion/kubernetes-client-windows-amd64.tar.gz" # kubectl

install-k8s.sh

@@ -1,5 +1,5 @@
-KUBEADM_VERSION="1.14.2-0"
-KUBERNETES_VERSION="1.14.2-0"
+KUBEADM_VERSION="1.15.1"
+KUBERNETES_VERSION="1.15.1"
 
 # from https://kubernetes.io/docs/setup/independent/install-kubeadm/