Merge pull request #39 from stephenmoloney/feature/flexible-docker-and-ubuntu

Easier terraform choice of docker and ubuntu versions

Author: stefanprodan

README.md

@@ -50,7 +50,8 @@ $ terraform apply \
  -var nodes=1 \
  -var server_type_node=C2S \
  -var weave_passwd=ChangeMe \
- -var docker_version=17.12.0~ce-0~ubuntu
+ -var docker_version=18.06 \
+ -var ubuntu_version="Ubuntu Bionic"
 ```
 
 This will do the following:
@@ -91,7 +92,8 @@ $ terraform apply \
  -var nodes=2 \
  -var server_type_node=C1 \
  -var weave_passwd=ChangeMe \
- -var docker_version=17.03.0~ce-0~ubuntu-xenial
+ -var docker_version=18.06 \
+ -var ubuntu_version="Ubuntu Xenial"
 ```
 
 ### Remote control

main.tf

@@ -7,7 +7,7 @@ provider "external" {
   version = "1.0.0"
 }
 
-data "scaleway_image" "xenial" {
+data "scaleway_image" "ubuntu" {
   architecture = "${var.arch}"
-  name         = "Ubuntu Xenial"
+  name         = "${var.ubuntu_version}"
 }

master.tf

@@ -5,7 +5,7 @@ resource "scaleway_ip" "k8s_master_ip" {
 resource "scaleway_server" "k8s_master" {
   count          = 1
   name           = "${terraform.workspace}-master-${count.index + 1}"
-  image          = "${data.scaleway_image.xenial.id}"
+  image          = "${data.scaleway_image.ubuntu.id}"
   type           = "${var.server_type}"
   public_ip      = "${element(scaleway_ip.k8s_master_ip.*.ip, count.index)}"
   security_group = "${scaleway_security_group.master_security_group.id}"
@@ -36,8 +36,9 @@ set -e
 chmod +x /tmp/docker-install.sh
 chmod +x /tmp/kubeadm-install.sh
 
-/tmp/docker-install.sh ${var.docker_version} && \
-/tmp/kubeadm-install.sh ${var.k8s_version}
+export ubuntu_version=$(echo -n ${var.ubuntu_version} | cut -d " " -f 2 | awk '{print tolower($0)}')
+/tmp/docker-install.sh $${ubuntu_version} ${var.arch} ${var.docker_version} && \
+/tmp/kubeadm-install.sh ${var.k8s_version} && \
 
 modify_kube_apiserver_config(){
   while [[ ! -e /etc/kubernetes/manifests/kube-apiserver.yaml ]]; do

nodes.tf

@@ -5,7 +5,7 @@ resource "scaleway_ip" "k8s_node_ip" {
 resource "scaleway_server" "k8s_node" {
   count          = "${var.nodes}"
   name           = "${terraform.workspace}-node-${count.index + 1}"
-  image          = "${data.scaleway_image.xenial.id}"
+  image          = "${data.scaleway_image.ubuntu.id}"
   type           = "${var.server_type_node}"
   public_ip      = "${element(scaleway_ip.k8s_node_ip.*.ip, count.index)}"
   security_group = "${scaleway_security_group.node_security_group.id}"
@@ -31,7 +31,8 @@ resource "scaleway_server" "k8s_node" {
   provisioner "remote-exec" {
     inline = [
       "set -e",
-      "chmod +x /tmp/docker-install.sh && /tmp/docker-install.sh ${var.docker_version}",
+      "export ubuntu_version=$(echo -n ${var.ubuntu_version} | cut -d \" \" -f 2 | awk '{print tolower($0)}')",
+      "chmod +x /tmp/docker-install.sh && /tmp/docker-install.sh $${ubuntu_version} ${var.arch} ${var.docker_version}",
       "chmod +x /tmp/kubeadm-install.sh && /tmp/kubeadm-install.sh ${var.k8s_version}",
       "${data.external.kubeadm_join.result.command}",
     ]

scripts/docker-install.sh

@@ -2,14 +2,28 @@
 
 set -e
 
-DOCKER_VERSION=$1
+UBUNTU_VERSION=$1
+ARCH=$2
+DOCKER_VERSION=$3
+
+if [[ ${ARCH} == "arm" ]]; then export ARCH=armhf; fi
+if [[ ${ARCH} == "x86_64" ]]; then export ARCH=amd64; fi
 
 apt-get update -qq
 apt-get install -y -qq apt-transport-https ca-certificates curl git
 curl -fsSL "https://download.docker.com/linux/ubuntu/gpg" | apt-key add -qq -
-echo "deb https://download.docker.com/linux/ubuntu xenial stable" | tee /etc/apt/sources.list.d/docker.list
+echo "deb [arch=${ARCH}] https://download.docker.com/linux/ubuntu ${UBUNTU_VERSION} stable" | \
+  tee /etc/apt/sources.list.d/docker.list
 apt-get update -qq
-apt-get install -y -qq --no-install-recommends docker-ce=${DOCKER_VERSION}
+
+if (( $(echo -n ${DOCKER_VERSION} | wc -c) > 5 )); then
+  export EXACT_DOCKER_VERSION=${DOCKER_VERSION}
+else
+  export EXACT_DOCKER_VERSION=$(apt-cache madison docker-ce | \
+    grep "${DOCKER_VERSION}.*${UBUNTU_VERSION}" | awk 'NR==1 {print $3}')
+fi
+
+apt-get install -y -qq --no-install-recommends docker-ce=${EXACT_DOCKER_VERSION}
 apt-mark hold docker-ce
 docker version
 

scripts/monitoring-install.sh

@@ -15,7 +15,9 @@ if [ "$ARCH" == "arm" ]; then
     kubectl apply -f /tmp/heapster-arm.yaml;
     kubectl apply -f /tmp/metrics-server-arm.yaml;
 elif [ "$ARCH" == "x86_64" ]; then
-    kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/master/aio/deploy/alternative/kubernetes-dashboard.yaml;
+    curl -s -f https://raw.githubusercontent.com/kubernetes/dashboard/master/aio/deploy/alternative/kubernetes-dashboard.yaml | \
+    sed -e 's/v2.0.0-alpha0/v1.8.3/g' | \
+    kubectl apply -f -;
     kubectl apply -f /tmp/heapster-amd64.yaml;
     kubectl apply -f /tmp/metrics-server-amd64.yaml;
 fi

variables.tf

@@ -1,6 +1,36 @@
+variable "ubuntu_version" {
+  default = "Ubuntu Xenial"
+  description = <<EOT
+
+For arm, choose from:
+  - Ubuntu Xenial
+
+For x86_64, choose from:
+  - Ubuntu Xenial
+  - Ubuntu Bionic
+
+Notes:
+  - kubernetes only has xenial packages for debian
+  - currently arm is not working with ubuntu bionic (kubeadm init hangs)
+
+EOT
+}
+
 variable "docker_version" {
-  default     = "17.03.0~ce-0~ubuntu-xenial"
-  description = "Use 17.12.0~ce-0~ubuntu for x86_64 and 17.03.0~ce-0~ubuntu-xenial for arm"
+  default     = "18.06"
+  description = <<EOT
+
+Specify the docker version either as
+
+  - Simplified 5 characters name such as:
+    - 17.03
+    - 18.06
+
+  - The exact release name such as:
+    - 17.03.0~ce-0~ubuntu-xenial
+    - 18.06.0~ce~3-0~ubuntu
+
+EOT
 }
 
 variable "k8s_version" {