use binary release of etcd for etcd servers

Author: bakins

kubernetes.tf

@@ -98,6 +98,7 @@ resource "template_file" "kubernetes" {
         containers_cidr = "${var.containers_cidr}"
         kubernetes_version = "${var.kubernetes_version}"
         portal_net = "${var.portal_net}"
+        etcd_version = "${var.etcd_version}"
     }
 }
 
@@ -131,8 +132,8 @@ resource "aws_instance" "etcd" {
 
 
     provisioner "file" {
-        source = "scripts/${self.tags.Role}.sh"
-        destination = "/tmp/${self.tags.Role}.sh"
+        source = "scripts"
+        destination = "/tmp/scripts"
     }
 
     provisioner "remote-exec" {
@@ -142,10 +143,11 @@ resource "aws_instance" "etcd" {
             "sudo mv /tmp/network.env /etc/network.env",
             "cat <<'EOF' > /tmp/kubernetes.env\n${template_file.kubernetes.rendered}\nEOF",
             "sudo mv /tmp/kubernetes.env /etc/kubernetes.env",
-            "sudo bash /tmp/${self.tags.Role}.sh"
+            "sudo bash /tmp/scripts/${self.tags.Role}.sh"
         ]
     }
 }
+
 resource "aws_instance" "master" {
     ami = "${var.ami}"
     instance_type = "t2.medium"
@@ -236,4 +238,3 @@ output "kubernetes-api-server" {
     value = "${template_file.kubectl-config.rendered}"
 }
 
-

scripts/etcd.sh

@@ -5,13 +5,11 @@ set -x
 source /etc/kubernetes.env
 source /etc/network.env
 
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-start() {
-  systemctl daemon-reload
-  systemctl enable ${1}.service
-  systemctl start ${1}.service
-}
+source $DIR/functions.sh
 
+setup-install-etcd
 
 cat <<EOF > /etc/etcd.env
 ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
@@ -20,12 +18,26 @@ ETCD_INITIAL_ADVERTISE_PEER_URLS=http://${PRIVATE_IP}:2380
 ETCD_ADVERTISE_CLIENT_URLS=http://${PRIVATE_IP}:2379
 EOF
 
-mkdir -p /etc/systemd/system/etcd2.service.d
-cat <<EOF > /etc/systemd/system/etcd2.service.d/50-etcd.conf
+cat <<'EOF' > /etc/systemd/system/etcd.service
+[Unit]
+Description=etcd
+
 [Service]
 EnvironmentFile=/etc/kubernetes.env
 EnvironmentFile=/etc/etcd.env
+Environment=ETCD_DATA_DIR=/var/lib/etcd2
+Environment=ETCD_NAME=%m
+User=etcd
+PermissionsStartOnly=true
+ExecStartPre=/opt/bin/install-etcd
+ExecStart=/opt/bin/etcd
+Restart=always
+RestartSec=10s
+LimitNOFILE=40000
+
+[Install]
+WantedBy=multi-user.target
 EOF
 
-start etcd2
+start etcd
 

scripts/functions.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+
+
+enable() {
+  systemctl daemon-reload
+  systemctl enable ${1}.service
+}
+
+start() {
+  systemctl daemon-reload
+  systemctl enable ${1}.service
+  systemctl start ${1}.service
+}
+
+setup-install-etcd() {
+  mkdir -p /opt/bin
+  cp $DIR/install-etcd /opt/bin/install-etcd
+  chmod +x /opt/bin/install-etcd
+}
+

scripts/install-etcd

@@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+source /etc/kubernetes.env
+
+if [ -f /opt/etcd-${ETCD_BINARY_VERSION}/bin/etcd ]; then
+  exit 0
+fi
+
+cd /tmp
+
+if [ ! -f etcd-${ETCD_BINARY_VERSION}.tar.gz ]; then
+  curl -o etcd-${ETCD_BINARY_VERSION}.tar.gz -L -s https://github.com/coreos/etcd/releases/download/v2.0.11/etcd-v2.0.11-linux-amd64.tar.gz
+fi
+
+mkdir -p /opt/etcd-${ETCD_BINARY_VERSION}/bin
+
+tar -zxf etcd-${ETCD_BINARY_VERSION}.tar.gz
+cp etcd-v${ETCD_BINARY_VERSION}-linux-amd64/{etcd,etcdctl} /opt/etcd-${ETCD_BINARY_VERSION}/bin
+
+chmod -R 755 /opt/etcd-${ETCD_BINARY_VERSION}/bin
+
+mkdir -p /opt/bin
+for P in /opt/etcd-${ETCD_BINARY_VERSION}/bin/*; do
+  ln -sf $P /opt/bin/
+done
+
+

templates/kubernetes.sh

@@ -2,3 +2,4 @@ KUBERNETES_CONTAINERS_CIDR="${containers_cidr}"
 KUBERNETES_VERSION="${kubernetes_version}"
 KUBERNETES_PORTAL_NET="${portal_net}"
 ETCD_DISCOVERY="${etcd_dicovery_url}"
+ETCD_BINARY_VERSION="${etcd_version}"

variables.tf

@@ -37,3 +37,8 @@ variable "ami" {
 variable "kubernetes_version" {
     default = "0.17.1"
 }
+
+variable "etcd_version" {
+    description = "version of etcd to use"
+    default = "2.0.11"
+}