Skip to content

Commit

Permalink
Merge pull request #2 from Abdennebi/update
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
Abdennebi Mohamed authored Nov 6, 2018
2 parents 71a994e + 1d2d3cb commit fe646e3
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# kubernetes-from-scratch

## Versions
Etcd : 3.1.12
Docker 17.03.x
Etcd : 3.1.12 => 3.2.24
Docker 17.03.x => 18.06
CNI 0.6.0
CSI 0.3.0

### Add-ons

Dashboard : v1.8.3
Heapster : v1.5.0
Kube-dns : v1.14.8
Heapster : v1.5.0 => 1.6.0-beta
Kube-dns : v1.14.8 => 1.14.13
2 changes: 1 addition & 1 deletion scripts/docker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

DOCKER_VERSION="17.03.2"
DOCKER_VERSION="18.06.1"
BIN_DIR=/usr/local/bin
DOCKER_SERVICE=/etc/systemd/system/docker.service

Expand Down
4 changes: 2 additions & 2 deletions scripts/etcd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
set -e
set -o pipefail

ETCD_VERSION="v3.1.12"
ETCD_VERSION="v3.2.24"
BIN_DIR=/usr/local/bin/
ETCD_SERVICE=/etc/systemd/system/etcd.service
ETCD_DATA=/var/lib/etcd/

install_etcd() {

local download_url="https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz"
local download_url="https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz"

# Download etcd distro then copy etcd and etcdctl to /usr/local/bin/
wget -qO- $download_url | tar -xvz -C $BIN_DIR --wildcards "etcd-${ETCD_VERSION}-linux-amd64/etcd*" --strip-components=1
Expand Down
2 changes: 1 addition & 1 deletion scripts/master.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e
set -o pipefail

KUBERNETES_VERSION="v1.10.0"
KUBERNETES_VERSION="v1.12.2"
BIN_DIR=/usr/local/bin
ETCD_SERVERS=http://localhost:2379
API_SERVER_URL=http://127.0.0.1:8080
Expand Down
4 changes: 2 additions & 2 deletions scripts/vagrant/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require 'fileutils'

Vagrant.require_version ">= 2.0.0"

NODE_IP = "172.17.4.99"
NODE_IP = "192.168.99.101"
NODE_VCPUS = 1
NODE_MEMORY_SIZE = 2048
NODE_MEMORY_SIZE = 4096

Vagrant.configure("2") do |config|
# always use Vagrants insecure key
Expand Down
2 changes: 1 addition & 1 deletion scripts/worker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e
set -o pipefail

KUBERNETES_VERSION="v1.10.0"
KUBERNETES_VERSION="v1.12.2"
CNI_VERSION="v0.6.0"
BIN_DIR="/usr/local/bin"
KUBE_CONFIG="/var/lib/kubelet/kubeconfig"
Expand Down

0 comments on commit fe646e3

Please sign in to comment.