chore(confd): remove confd in favor env vars that can configure things

New Env Vars are:
* REGISTRATION_MODE which defaults to enabled
* RESERVED_NAME which defaults to deis

Gunicorn reload script was left behind just to have an easy script to reload the process if that is desired instead of cycling the pod

Fixes #358

Author: helgi

rootfs/Dockerfile

@@ -3,13 +3,6 @@ FROM alpine:3.3
 # install common packages
 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 -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.12.0-alpha3/confd-0.12.0-alpha3-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"]
 EXPOSE 8000

rootfs/bin/boot

@@ -13,9 +13,6 @@ echo system information:
 echo "Django Version: $(./manage.py --version)"
 python --version
 
-# spawn confd in the background to update services based on changes
-confd -backend env --confdir /app --log-level error --interval 5 &
-
 mkdir -p /app/data/logs
 chmod -R 777 /app/data/logs
 
@@ -27,18 +24,18 @@ else
 fi
 
 echo "Django checks:"
-python /app/manage.py check --deploy api
+python /app/manage.py check --settings deis.production --deploy api
 
 echo "Health Checks:"
-python /app/manage.py healthchecks
+python /app/manage.py healthchecks --settings deis.production
 
 echo "Database Migrations:"
-sudo -E -u deis python /app/manage.py migrate --noinput
+sudo -E -u deis python /app/manage.py migrate --settings deis.production --noinput
 
 # spawn a gunicorn server in the background
 sudo -E -u deis gunicorn -c /app/deis/gconf.py deis.wsgi &
 
-python /app/manage.py load_db_state_to_k8s
+python /app/manage.py load_db_state_to_k8s --settings deis.production
 
 # smart shutdown on SIGTERM (SIGINT is handled by gunicorn)
 function on_exit() {

rootfs/build.sh

@@ -33,8 +33,8 @@ adduser deis -D -h /app -s /bin/bash
 # create a /app directory for storing application data
 mkdir -p /app && chown -R deis:deis /app
 
-# create directory for confd templates
-mkdir -p /templates && chown -R deis:deis /templates
+# create directory for configurations
+mkdir -p /configs && chown -R deis:deis /configs
 
 # install dependencies
 pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt

rootfs/conf.d/gconf.toml

@@ -1,6 +1,8 @@
+import os
+
 bind = '0.0.0.0'
 try:
-    workers = int({{ if exists "/deis/controller/workers" }}{{ getv "/deis/controller/workers" }}{{ else }}"not set"{{end}})
+    workers = int(os.environ.get('GUNICORN_WORKERS', 'not set'))
     if workers < 1:
         raise ValueError()
 except (NameError, ValueError):

rootfs/conf.d/local_settings.toml

@@ -1,6 +1,4 @@
-import os
-
-from .settings import *
+from deis.settings import *  # noqa
 
 # security keys and auth tokens
 with open('/var/run/secrets/api/builder/auth/builder-key') as f:
@@ -16,9 +14,3 @@
     DATABASES['default']['PASSWORD'] = f.read().strip()
 
 DATABASES['default']['NAME'] = DATABASES['default']['USER']
-
-REGISTRATION_MODE = '{{ getv "/deis/controller/registration/mode" "enabled" }}'
-
-{{ if exists "/deis/controller/subdomain" }}
-DEIS_RESERVED_NAMES = ['{{ getv "/deis/controller/subdomain" }}']
-{{ end }}

rootfs/templates/gconf.py rootfs/deis/gconf.pyrootfs/templates/gconf.py renamed to rootfs/deis/gconf.py

@@ -250,7 +250,7 @@
 TEMPDIR = tempfile.mkdtemp(prefix='deis')
 
 # names which apps cannot reserve for routing
-DEIS_RESERVED_NAMES = ['deis']
+DEIS_RESERVED_NAMES = [os.environ.get('RESERVED_NAMES', 'deis')]
 
 # default scheduler settings
 SCHEDULER_MODULE = 'scheduler'
@@ -276,7 +276,7 @@
 LOGGER_PORT = os.environ.get('DEIS_LOGGER_SERVICE_PORT_HTTP', 80)
 
 # check if we can register users with `deis register`
-REGISTRATION_ENABLED = True
+REGISTRATION_MODE = os.environ.get('REGISTRATION_MODE', 'enabled')
 
 DATABASES = {
     'default': {
@@ -290,13 +290,3 @@
 }
 
 APP_URL_REGEX = '[a-z0-9-]+'
-
-# Create a file named "local_settings.py" to contain sensitive settings data
-# such as database configuration, admin email, or passwords and keys. It
-# should also be used for any settings which differ between development
-# and production.
-# The local_settings.py file should *not* be checked in to version control.
-try:
-    from .local_settings import *  # noqa
-except ImportError:
-    pass