Merge branch 'master' of github.com:nre-learning/antidote-selfmedicate

Author: Mierdin

Vagrantfile

@@ -75,12 +75,12 @@ Vagrant.configure("2") do |config|
     v.memory = antidote_config['vm_config']['memory']
     v.cpus = antidote_config['vm_config']['cores']
     v.nested = true
-    override.vm.box = "generic/ubuntu1604"
+    override.vm.box = "generic/ubuntu1804"
   end
 
 
   # Base Ubuntu Box
-  config.vm.box = "bento/ubuntu-16.04"
+  config.vm.box = "bento/ubuntu-18.04"
 
   config.vm.hostname = "antidote-#{antidote_config['version'].to_s.tr('.', '')}"
 

selfmedicate.sh

@@ -117,12 +117,17 @@ sub_start(){
 	sudo cp manifests/multus-cni.conf /etc/cni/net.d/1-multus.conf
     echo "Creating minikube cluster. This can take a few minutes, please be patient..."
     $MINIKUBE config set WantReportErrorPrompt false
+    # Avoid CoreDNS loop caused by systemd's local DNS cache
+    if [ "$VMDRIVER" = "none" ]; then
+        EXTRA_PARAMS="--extra-config=kubelet.resolv-conf=/run/systemd/resolve/resolv.conf"
+    fi
     $MINIKUBE start \
     --cpus $CPUS \
     --memory $MEMORY \
     --vm-driver $VMDRIVER \
     --network-plugin=cni \
     --extra-config=kubelet.network-plugin=cni \
+    $EXTRA_PARAMS \
     --kubernetes-version=$K8SVERSION  # Needs to reflect the targeted version the platform was built against.
 
     echo -e "\nThe minikube cluster ${WHITE}is now online${NC}. Now, we need to add some additional infrastructure components.\n"