fix(rootfs): use k8s env vars to find etcd

Author: mboersma

Makefile

@@ -1,3 +1,6 @@
+ifndef BUILD_TAG
+  BUILD_TAG = git-$(shell git rev-parse --short HEAD)
+endif
 
 COMPONENT = workflow
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
@@ -9,9 +12,14 @@ check-docker:
 	  exit 2; \
 	fi
 
-build: check-docker
+build: docker-build
+
+docker-build: check-docker
 	docker build --rm -t $(IMAGE) rootfs
 
+docker-push:
+	docker push ${IMAGE}
+
 clean: check-docker
 	docker rmi $(IMAGE)
 

rootfs/Dockerfile

@@ -1,15 +1,17 @@
 FROM alpine:3.2
 
 # install common packages
-RUN apk add --update-cache curl bash sudo && rm -rf /var/cache/apk/*
-
-# install etcdctl
-RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/get-deis/etcdctl-v0.4.9 \
-    && chmod +x /usr/local/bin/etcdctl
-
-# install confd
-RUN curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.10.0/confd-0.10.0-linux-amd64 \
-    && chmod +x /usr/local/bin/confd
+RUN apk add --update-cache curl bash openssl sudo && rm -rf /var/cache/apk/*
+
+# install etcdctl and confd
+RUN apk add --update-cache curl tar \
+    && curl -sSL https://github.com/coreos/etcd/releases/download/v2.2.1/etcd-v2.2.1-linux-amd64.tar.gz \
+    | tar -vxz -C /usr/local/bin --strip=1 etcd-v2.2.1-linux-amd64/etcdctl \
+    && chown root:root /usr/local/bin/etcdctl \
+    && curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.10.0/confd-0.10.0-linux-amd64 \
+    && chmod +x /usr/local/bin/confd \
+    && apk del --purge curl tar \
+    && rm -rf /var/cache/apk/*
 
 # define execution environment
 CMD ["/app/bin/boot"]

rootfs/bin/boot

@@ -8,10 +8,12 @@ set -eo pipefail
 
 # set debug based on envvar
 [[ $DEBUG ]] && set -x
+set -x
 
 # configure etcd
-export ETCD_PORT=${ETCD_PORT:-4001}
-export ETCD="$HOST:$ETCD_PORT"
+export ETCD_PORT=${DEIS_ETCD_1_SERVICE_PORT_CLIENT:-4001}
+export ETCD_HOST=${DEIS_ETCD_1_SERVICE_HOST:-$HOST}
+export ETCD="$ETCD_HOST:$ETCD_PORT"
 export ETCD_PATH=${ETCD_PATH:-/deis/controller}
 export ETCD_TTL=${ETCD_TTL:-20}
 
@@ -26,8 +28,7 @@ sleep $((ETCD_TTL+1))
 
 function etcd_set_default {
 	set +e
-	ERROR="$(etcdctl --no-sync -C "$ETCD" mk "$ETCD_PATH/$1" "$2" >/dev/null 2>&1)"
-
+	ERROR="$(etcdctl --no-sync -C "$ETCD" mk "$ETCD_PATH/$1" "$2" 2>&1 >/dev/null)"
 	if [[ $? -ne 0 ]] && echo "$ERROR" | grep -iqve "key already exists"; then
 		echo "etcd_set_default: an etcd error occurred ($ERROR)"
 		echo "aborting..."
@@ -38,7 +39,7 @@ function etcd_set_default {
 
 function etcd_safe_mkdir {
 	set +e
-	ERROR="$(etcdctl --no-sync -C "$ETCD" mkdir "$1" >/dev/null 2>&1)"
+	ERROR="$(etcdctl --no-sync -C "$ETCD" mkdir "$1" 2>&1 >/dev/null)"
 
 	if [[ $? -ne 0 ]] && echo "$ERROR" | grep -iqve "key already exists"; then
 		echo "etcd_safe_mkdir: an etcd error occurred ($ERROR)"
@@ -61,6 +62,29 @@ etcd_safe_mkdir /deis/platform
 etcd_safe_mkdir /deis/scheduler
 etcd_safe_mkdir /deis/services
 
+# HACK: set up keys for database
+etcd_safe_mkdir /deis/database
+ETCD_PATH=/deis/database etcd_set_default engine postgresql_psycopg2
+ETCD_PATH=/deis/database etcd_set_default name deis
+ETCD_PATH=/deis/database etcd_set_default user deis
+ETCD_PATH=/deis/database etcd_set_default password changeme123
+ETCD_PATH=/deis/database etcd_set_default host "${DEIS_DATABASE_SERVICE_HOST:-127.0.0.1}"
+ETCD_PATH=/deis/database etcd_set_default port "${DEIS_DATABASE_SERVICE_PORT:-5432}"
+
+# HACK: set up keys for logs
+etcd_safe_mkdir /deis/logs
+# ETCD_PATH=/deis/logs etcd_set_default host "${DEIS_LOGS_SERVICE_HOST:-127.0.0.1}"
+
+# HACK: set up keys for platform
+etcd_safe_mkdir /deis/platform
+ETCD_PATH=/deis/platform etcd_set_default domain localhost
+
+# HACK: set up keys for registry
+etcd_safe_mkdir /deis/registry
+# ETCD_PATH=/deis/registry etcd_set_default protocol "${DEIS_REGISTRY_SERVICE_PROTOCOL:-http}"
+# ETCD_PATH=/deis/registry etcd_set_default host "${DEIS_REGISTRY_SERVICE_HOST:-127.0.0.1}"
+# ETCD_PATH=/deis/registry etcd_set_default port "${DEIS_REGISTRY_SERVICE_PORT:-5000}"
+
 # run etcd data migrations
 echo "controller: running etcd data migrations..."
 for script in /app/migrations/data/*.sh;

rootfs/deis/settings.py

@@ -284,7 +284,8 @@
 TEST_RUNNER = 'api.tests.SilentDjangoTestSuiteRunner'
 
 # etcd settings
-ETCD_HOST, ETCD_PORT = os.environ.get('ETCD', '127.0.0.1:4001').split(',')[0].split(':')
+ETCD_HOST = os.environ.get('DEIS_ETCD_1_SERVICE_HOST', '127.0.0.1')
+ETCD_PORT = os.environ.get('DEIS_ETCD_1_SERVICE_PORT_CLIENT', 4001)
 
 # default deis settings
 LOG_LINES = 1000

rootfs/migrations/data/0001.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-ETCD_PORT=${ETCD_PORT:-4001}
-ETCD="$HOST:$ETCD_PORT"
 ETCDCTL="etcdctl -C $ETCD"
 
 if [[ "$($ETCDCTL get /deis/migrations/data/0001 2> /dev/null)" != "done" ]];

rootfs/migrations/data/0002.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-ETCD_PORT=${ETCD_PORT:-4001}
-ETCD="$HOST:$ETCD_PORT"
 ETCDCTL="etcdctl -C $ETCD"
 
 # April 8, 2015: If registrationEnabled key exists, migrate it to registrationMode and delete it.

rootfs/templates/confd_settings.py

@@ -32,9 +32,10 @@
 REGISTRY_PORT = '{{ getv "/deis/registry/port" }}'
 
 # default to sqlite3, but allow postgresql config through envvars
+# 'ENGINE': 'django.db.backends.{{ getv "/deis/database/engine" }}',
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.{{ getv "/deis/database/engine" }}',
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': '{{ getv "/deis/database/name" }}',
         'USER': '{{ getv "/deis/database/user" }}',
         'PASSWORD': '{{ getv "/deis/database/password" }}',