Skip to content

Commit

Permalink
Fixed portability issues with BSD sed and kube-dns
Browse files Browse the repository at this point in the history
  • Loading branch information
hanikesn committed Jan 15, 2016
1 parent 84f9f91 commit 8e59b9f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: default clean dist-clean add-box del-box

VERSION=0.3.1
VERSION=0.1.1

default: stripped.box

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions vg-00-kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8e59b9f

Please sign in to comment.