Skip to content
This repository has been archived by the owner on May 29, 2020. It is now read-only.

Commit

Permalink
Bump to 1.8.0
Browse files Browse the repository at this point in the history
Use contrib box again instead of installing vbox guest extensions.
  • Loading branch information
hanikesn committed Oct 2, 2017
1 parent d4a7125 commit 043f823
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: default

VERSION=1.7.4
VERSION=1.8.0

default: stripped.box box.meta

Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Vagrant.configure(2) do |config|
config.vm.box = "debian/stretch64"
config.vm.box = "debian/contrib-stretch64"
# config.vm.box_version = "=9.1.0"
# Disabled VirtualBox Guest updates
if Vagrant.has_plugin?("vagrant-vbguest")
Expand Down
4 changes: 2 additions & 2 deletions conf/kube-dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ spec:
metadata:
labels:
k8s-app: kubernetes-dashboard
version: v1.6.1
version: v1.7.0
kubernetes.io/cluster-service: "true"
spec:
serviceAccountName: dashboard
containers:
- name: kubernetes-dashboard
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.1
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.7.0
ports:
- containerPort: 9090
protocol: TCP
Expand Down
3 changes: 2 additions & 1 deletion conf/kubelet.service
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ ExecStart=/usr/bin/hyperkube kubelet \
--address=0.0.0.0 \
--serialize-image-pulls=false \
--cluster-dns=${CLUSTERDNS_IP} \
--cluster-domain=${DNS_DOMAIN}
--cluster-domain=${DNS_DOMAIN} \
--fail-swap-on=false
Restart=always
RestartSec=10

Expand Down
9 changes: 6 additions & 3 deletions vg-00-kubernetes.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -euv -o pipefail

ETCD_VERSION=3.2.6
KUBERNETES_VERSION=1.7.4
ETCD_VERSION=3.2.8
KUBERNETES_VERSION=1.8.0
DOCKER_VERSION=17.06.0

KUBERNETES_SERVER_SHA256=09c420fdb9b912c172b19638d67b27bc7994e2608185051f412804fa55790076
KUBERNETES_SERVER_SHA256=23422a7f11c3eab59d686a52abae1bce2f9e2a0916f98ed05c10591ba9c3cbad

NET_CIRD=10.10.0.0/24
DOCKER_CIRD=10.10.0.128/25
Expand Down Expand Up @@ -114,6 +114,9 @@ until $(curl --output /dev/null --silent --head --fail http://localhost:8080); d
sleep 1
done

# Give it a bit more time to load everything
sleep 2

kubectl apply -f /etc/kubernetes/manifests/kube-master.yml
kubectl apply -f /etc/kubernetes/manifests/kube-dns.yml
kubectl apply -f /etc/kubernetes/manifests/kube-dashboard.yml
Expand Down
10 changes: 0 additions & 10 deletions vg-01-repartition.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,6 @@ until $(kubectl --namespace=kube-system get pods | grep -q '^kube-dns.*3/3.*$');
done
set -euv

# Install additions after reboot, so we have the correct running kernel
VBOX_VERSION=5.1.22
apt-get install -yq --no-install-recommends linux-headers-$(uname -r)
wget http://download.virtualbox.org/virtualbox/${VBOX_VERSION}/VBoxGuestAdditions_${VBOX_VERSION}.iso -qO vbox.iso
mount -o loop vbox.iso /mnt
/mnt/VBoxLinuxAdditions.run --nox11
umount /mnt
rm vbox.iso
apt-get -y remove linux-headers-$(uname -r)

# cleanup
apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/*

Expand Down

0 comments on commit 043f823

Please sign in to comment.