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

Commit

Permalink
Update to debian9 and k8s 1.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
hanikesn committed Jun 6, 2017
1 parent e78a259 commit c0cc69f
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 17 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.5.1
VERSION=1.6.3

default: stripped.box box.meta

Expand Down
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Vagrant.configure(2) do |config|
config.vm.box = "debian/contrib-jessie64"
config.vm.box_version = ">=8.6.2"
config.vm.box = "debian/stretch64"
# config.vm.box_version = ">=8.6.2"
# Disabled VirtualBox Guest updates
if Vagrant.has_plugin?("vagrant-vbguest")
config.vbguest.auto_update = false
Expand Down
6 changes: 6 additions & 0 deletions Vagrantfile.dist
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
vboxVersion = `vboxmanage --version`

if Gem::Version.new(vboxVersion) < Gem::Version.new('5.1')
throw "VirtualBox version too old. Please upgrade to 5.1"
end

Vagrant.configure(2) do |config|
# Create a private network, which allows host-only access to the machine
# using a specific IP.
Expand Down
4 changes: 2 additions & 2 deletions conf/kube-dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ spec:
metadata:
labels:
k8s-app: kubernetes-dashboard
version: v1.4.0
version: v1.6.1
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubernetes-dashboard
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.4.0
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.1
ports:
- containerPort: 9090
protocol: TCP
Expand Down
8 changes: 7 additions & 1 deletion example/Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Vagrant.configure(2) do |config|
config.vm.box = "flixtech/kubernetes"
config.vm.box = "debian/stretch64"
end

vboxVersion = `vboxmanage --version`

if Gem::Version.new(vboxVersion) < Gem::Version.new('5.1')
throw "VirtualBox version too old. Please upgrade to 5.1"
end
24 changes: 13 additions & 11 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.0.15
KUBERNETES_VERSION=1.5.1
DOCKER_VERSION=1.12.5
ETCD_VERSION=3.1.8
KUBERNETES_VERSION=1.6.4
DOCKER_VERSION=17.03.1

KUBERNETES_SERVER_SHA256=871a9f35e1c73f571b7113e01a91d7bfc5bfe3501e910c921a18313774b25fd1
KUBERNETES_SERVER_SHA256=76a1d6dbce630b50fd3a5f566fcea6ef1a04996cf4f4c568338a3db0d3b6a3d5

NET_CIRD=10.10.0.0/24
DOCKER_CIRD=10.10.0.128/25
Expand Down Expand Up @@ -43,12 +43,15 @@ echo "SystemMaxUse=1G" >> /etc/systemd/journald.conf
# Give the vagrant user full access to the journal
usermod -a -G systemd-journal vagrant
# Remove rsyslog
apt-get --quiet --yes --force-yes purge rsyslog
apt-get --quiet --yes purge rsyslog

apt-get --quiet update
apt-get --quiet --yes install apt-transport-https


# docker
echo "deb http://apt.dockerproject.org/repo debian-jessie main" > /etc/apt/sources.list.d/docker.list
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
echo "deb https://download.docker.com/linux/debian stretch stable" > /etc/apt/sources.list.d/docker.list
wget -qO- https://download.docker.com/linux/debian/gpg | apt-key add -
# sysdig
echo 'deb http://download.draios.com/stable/deb stable-$(ARCH)/' > /etc/apt/sources.list.d/sysdig.list
wget -qO- https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public | apt-key add -
Expand All @@ -60,13 +63,12 @@ systemctl mask docker

apt-get --quiet update
apt-get --quiet --yes dist-upgrade
echo 'deb http://http.us.debian.org/debian sid main non-free contrib' > /etc/apt/sources.list.d/unstable.list
# Install bridge-utils first, so that we can get the bridget for docker up
apt-get --quiet --yes --target-release jessie-backports -o Dpkg::Options::="--force-confnew" install linux-image-amd64 linux-headers-amd64 systemd virtualbox-guest-dkms virtualbox-guest-utils
apt-get --quiet --yes --no-install-recommends install \
bridge-utils ethtool htop vim curl \
build-essential \
docker-engine=${DOCKER_VERSION}-0~debian-jessie \
sysdig bindfs # For sysdig # bindfs is for fixing NFS mount permissions
docker-ce=${DOCKER_VERSION}~ce-0~debian-stretch \
sysdig-dkms bindfs # For sysdig # bindfs is for fixing NFS mount permissions

# Add vagrant user to docker group, so that vagrant can user docker without sudo
usermod -aG docker vagrant
Expand Down

0 comments on commit c0cc69f

Please sign in to comment.