diff --git a/Makefile b/Makefile index 23b9fab..a444bb7 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: default clean dist-clean add-box del-box -VERSION=0.3.1 +VERSION=0.1.1 default: stripped.box @@ -37,7 +37,8 @@ package.box: .vagrant/repartinioned Vagrantfile.dist tmp/Vagrantfile: package.box mkdir -p tmp tar xzf package.box -C tmp/ - sed -i '/vagrant_private_key/d' tmp/Vagrantfile + sed -i.back '/vagrant_private_key/d' tmp/Vagrantfile + rm -f tmp/Vagrantfile.back rm -f tmp/vagrant_private_key stripped.box: tmp/Vagrantfile diff --git a/test/Vagrantfile b/test/Vagrantfile index e901dce..4750fc0 100644 --- a/test/Vagrantfile +++ b/test/Vagrantfile @@ -3,6 +3,6 @@ Vagrant.configure(2) do |config| # Disabled VirtualBox Guest updates if Vagrant.has_plugin?("vagrant-vbguest") -# config.vbguest.auto_update = false + config.vbguest.auto_update = false end end diff --git a/vg-00-kubernetes.sh b/vg-00-kubernetes.sh index ba4d4fc..27a6e49 100755 --- a/vg-00-kubernetes.sh +++ b/vg-00-kubernetes.sh @@ -88,8 +88,8 @@ systemctl enable kubelet kube-api-server kube-controller-manager kube-scheduler systemctl start kubelet kube-api-server kube-controller-manager kube-scheduler kube-proxy kube-etcd mkdir -p /etc/kubernetes/manifests -sed -e "s%\${DOMAIN}%${DOMAIN}%" -e "s%\${CLUSTERDNS_IP}%${CLUSTERDNS_IP}%" /vagrant/conf/kube-dns.rc.yml > /etc/kubernetes/manifests/kube-dns.rc.yml -sed -e "s%\${DOMAIN}%${DOMAIN}%" -e "s%\${CLUSTERDNS_IP}%${CLUSTERDNS_IP}%" /vagrant/conf/kube-dns.svc.yml > /etc/kubernetes/manifests/kube-dns.svc.yml +sed -e "s%\${DOMAIN}%${DOMAIN}%" -e "s%\${CLUSTERDNS_IP}%${CLUSTERDNS_IP}%" -e "s%\${BRIDGE_IP}%${BRIDGE_IP}%" /vagrant/conf/kube-dns.rc.yml > /etc/kubernetes/manifests/kube-dns.rc.yml +sed -e "s%\${DOMAIN}%${DOMAIN}%" -e "s%\${CLUSTERDNS_IP}%${CLUSTERDNS_IP}%" /vagrant/conf/kube-dns.svc.yml > /etc/kubernetes/manifests/kube-dns.svc.yml # Install sysdig echo "export SYSDIG_K8S_API=http://127.0.0.1:8080" >> /etc/profile.d/sysdig.sh