Skip to content

Commit 942ae69

Browse files
committed
ref(secrets): read generated secrets from k8s for the setings file
1 parent 3c4c26e commit 942ae69

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

rootfs/bin/boot

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ function etcd_safe_mkdir {
5050
}
5151

5252
etcd_set_default protocol "${DEIS_PROTOCOL:-http}"
53-
etcd_set_default secretKey "${DEIS_SECRET_KEY:-$(openssl rand -base64 64 | tr -d '\n')}"
54-
etcd_set_default builderKey "${DEIS_BUILDER_KEY:-$(openssl rand -base64 64 | tr -d '\n')}"
5553
etcd_set_default registrationMode "enabled"
5654
etcd_set_default webEnabled 0
5755

rootfs/templates/confd_settings.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import os
22

33
# security keys and auth tokens
4-
SECRET_KEY = '{{ getv "/deis/controller/secretKey" }}'
5-
BUILDER_KEY = '{{ getv "/deis/controller/builderKey" }}'
4+
with open('/var/run/secrets/api/builder/auth/builder-key') as f:
5+
BUILDER_KEY = f.read()
6+
7+
with open('/var/run/secrets/api/django/secret-key') as f:
8+
SECRET_KEY = f.read()
69

710
# scheduler settings
811
SCHEDULER_MODULE = 'scheduler'

0 commit comments

Comments
 (0)