commit b781c4ca973c64b024d9cf8a0a807838cb520edc
author Andy Bavier <andy@onlab.us> Thu Sep 20 08:16:52 2018 -0700
committer Andy Bavier <andy@onlab.us> Wed Jan 30 11:38:17 2019 -0700
tree c47b6483587c319550cfb7e50b1f47883756df3d
parent 659324bceefa854f97acfc475119f9bb2d8bce64

SEBA-243 Update Packer build with kubeadm (for E2E test)

Change-Id: Idb8e4340991c8930cdf45a3aa25ab223ffef8e82

packer/provision/basebuild.sh

diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 17d68e0..f16ae90 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -86,16 +86,20 @@
     # install basic sofware requirements
     apt-get install -y \
         "docker-ce=17.06*" \
+        apt-transport-https \
         ansible \
         build-essential \
         bzip2 \
         curl \
+        ebtables \
+        ethtool \
         git \
         golang-1.10-go \
         httpie \
-        "kubeadm=1.11.3-*" \
-        "kubelet=1.11.3-*" \
-        "kubectl=1.11.3-*" \
+        jq \
+        "kubeadm=1.12.4-*" \
+        "kubelet=1.12.4-*" \
+        "kubectl=1.12.4-*" \
         less \
         libmysqlclient-dev \
         libpcap-dev \
@@ -240,6 +244,12 @@
 jenkins ALL=(ALL) NOPASSWD:SETENV: CMDS
 EOF
 
+    # remove apparmor
+    service apparmor stop
+    update-rc.d -f apparmor remove
+    apt-get remove apparmor-utils libapparmor-perl apparmor
+    update-grub
+
     # clean up
     apt-get clean
     apt-get purge -y

packer/provision/baseline.sh

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index e34d7b8..9c08069 100644
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -228,6 +228,7 @@
     apt-get upgrade -m
     apt-get dist-upgrade -m
 
+    apt-get update -m
     ensure_ubuntu_install unzip xz-utils puppet git libxml-xpath-perl
 
     # install Java 7