Skip to content

Commit 471ec57

Browse files
committed
Merge pull request #635 from helgi/rc_secret
fix(scheduler): copy object-storage creds during RC creation instead …
2 parents 304e641 + 7b299b9 commit 471ec57

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

rootfs/scheduler/__init__.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -471,14 +471,6 @@ def create(self, namespace, **kwargs):
471471
except KubeException:
472472
self._create_namespace(namespace)
473473

474-
# only buildpack apps need acces to object storage
475-
if kwargs.get('build_type') == "buildpack":
476-
try:
477-
self._get_secret(namespace, 'objectstorage-keyfile')
478-
except KubeException:
479-
secret = self._get_secret('deis', 'objectstorage-keyfile').json()
480-
self._create_secret(namespace, 'objectstorage-keyfile', secret['data'])
481-
482474
try:
483475
self._get_service(namespace, namespace)
484476
except KubeException:
@@ -917,6 +909,13 @@ def _create_rc(self, namespace, name, image, command, **kwargs): # noqa
917909

918910
# Check if it is a slug builder image.
919911
if kwargs.get('build_type') == "buildpack":
912+
# only buildpack apps need access to object storage
913+
try:
914+
self._get_secret(namespace, 'objectstorage-keyfile')
915+
except KubeException:
916+
secret = self._get_secret('deis', 'objectstorage-keyfile').json()
917+
self._create_secret(namespace, 'objectstorage-keyfile', secret['data'])
918+
920919
l["image"] = image
921920
l['image_pull_policy'] = settings.SLUG_BUILDER_IMAGE_PULL_POLICY
922921
l["slugimage"] = settings.SLUGRUNNER_IMAGE

0 commit comments

Comments
 (0)