ref(controller): use kubernetes service discovery, remove publish loop

Author: Matthew

rootfs/bin/boot

@@ -53,37 +53,17 @@ etcd_set_default secretKey "${DEIS_SECRET_KEY:-$(openssl rand -base64 64 | tr -d
 etcd_set_default builderKey "${DEIS_BUILDER_KEY:-$(openssl rand -base64 64 | tr -d '\n')}"
 etcd_set_default registrationMode "enabled"
 etcd_set_default webEnabled 0
-etcd_set_default unitHostname default
 
 # safely create required keyspaces
 etcd_safe_mkdir /deis/domains
 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;
@@ -133,28 +113,4 @@ confd -node "$ETCD" --confdir /app --log-level error --interval 5 &
 
 echo deis-controller running...
 
-# publish the service to etcd using the injected EXTERNAL_PORT
-if [[ ! -z $EXTERNAL_PORT ]]; then
-
-	# configure service discovery
-	PORT=${PORT:-8000}
-	PROTO=${PROTO:-tcp}
-
-	set +e
-
-	# wait for the service to become available on PORT
-	sleep 1 && while [[ -z $(netstat -lnt | awk "\$6 == \"LISTEN\" && \$4 ~ \".$PORT\" && \$1 ~ \"$PROTO.?\"") ]] ; do sleep 1; done
-
-	# while the port is listening, publish to etcd
-	while [[ ! -z $(netstat -lnt | awk "\$6 == \"LISTEN\" && \$4 ~ \".$PORT\" && \$1 ~ \"$PROTO.?\"") ]] ; do
-		etcdctl --no-sync -C "$ETCD" set "$ETCD_PATH/host" "$HOST" --ttl "$ETCD_TTL" >/dev/null
-		etcdctl --no-sync -C "$ETCD" set "$ETCD_PATH/port" "$EXTERNAL_PORT" --ttl "$ETCD_TTL" >/dev/null
-		sleep $((ETCD_TTL/2)) # sleep for half the TTL
-	done
-
-	# if the loop quits, something went wrong
-	exit 1
-
-fi
-
 wait

rootfs/deis/settings.py

@@ -305,25 +305,28 @@
 BUILDER_KEY = os.environ.get('DEIS_BUILDER_KEY', 'CHANGEME_sapm$s%upvsw5l_zuy_&29rkywd^78ff(qi')
 
 # registry settings
-REGISTRY_URL = 'http://localhost:5000'
-REGISTRY_HOST = 'localhost'
-REGISTRY_PORT = 5000
+REGISTRY_HOST = os.environ.get('DEIS_REGISTRY_SERVICE_HOST', '127.0.0.1')
+REGISTRY_PORT = os.environ.get('DEIS_REGISTRY_SERVICE_PORT', 5000)
+REGISTRY_URL = '{}:{}'.format(REGISTRY_HOST, REGISTRY_PORT)
 
 # logger settings
-LOGGER_HOST = 'localhost'
-LOGGER_PORT = 8088
+LOGGER_HOST = os.environ.get('DEIS_LOGGER_SERVICE_HOST', '127.0.0.1')
+LOGGER_PORT = os.environ.get('DEIS_LOGGER_SERVICE_PORT', 8088)
 
 # check if we can register users with `deis register`
 REGISTRATION_ENABLED = True
 
 # check if we should enable the web UI module
 WEB_ENABLED = False
 
-# default to sqlite3, but allow postgresql config through envvars
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.' + os.environ.get('DATABASE_ENGINE', 'postgresql_psycopg2'),
-        'NAME': os.environ.get('DATABASE_NAME', 'deis'),
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': os.environ.get('DEIS_DATABASE_NAME', 'deis'),
+        'USER': os.environ.get('DEIS_DATABASE_USER', ''),
+        'PASSWORD': os.environ.get('DEIS_DATABASE_PASSWORD', ''),
+        'HOST': os.environ.get('DEIS_DATABASE_SERVICE_HOST', '127.0.0.1'),
+        'PORT': os.environ.get('DEIS_DATABASE_SERVICE_PORT', 5432),
         # randomize test database name so we can run multiple unit tests simultaneously
         'TEST_NAME': "unittest-{}".format(''.join(
             random.choice(string.ascii_letters + string.digits) for _ in range(8)))

rootfs/templates/confd_settings.py

@@ -6,32 +6,9 @@
 SCHEDULER_MODULE = 'scheduler.k8s'
 SCHEDULER_URL = 'kubernetes'
 
-# base64-encoded SSH private key to facilitate current version of "deis run"
-SSH_PRIVATE_KEY = """{{ if exists "/deis/platform/sshPrivateKey" }}{{ getv "/deis/platform/sshPrivateKey" }}{{ else }}""{{end}}"""
-
 # platform domain must be provided
 DEIS_DOMAIN = '{{ getv "/deis/platform/domain" }}'
 
-# use the private registry module
-REGISTRY_URL = '{{ getv "/deis/registry/protocol" }}://{{ getv "/deis/registry/host" }}:{{ getv "/deis/registry/port" }}'  # noqa
-REGISTRY_HOST = '{{ getv "/deis/registry/host" }}'
-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.postgresql_psycopg2',
-        'NAME': '{{ getv "/deis/database/name" }}',
-        'USER': '{{ getv "/deis/database/user" }}',
-        'PASSWORD': '{{ getv "/deis/database/password" }}',
-        'HOST': '{{ getv "/deis/database/host" }}',
-        'PORT': '{{ getv "/deis/database/port" }}',
-    }
-}
-
-LOGGER_HOST = '{{ getv "/deis/logs/host"}}'
-
 {{ if exists "/deis/controller/registrationMode" }}
 REGISTRATION_MODE = '{{ getv "/deis/controller/registrationMode" }}'
 {{ end }}