Skip to content
This repository was archived by the owner on May 6, 2020. It is now read-only.

Commit aa6e0f3

Browse files
committed
fix(secret):create objectstore secret before calling scheduler deploy
1 parent 9f6cb94 commit aa6e0f3

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

rootfs/api/models/app.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,9 @@ def deploy(self, release, force_deploy=False, rollback_on_failure=True): # noqa
478478
try:
479479
# create the application config in k8s (secret in this case) for all deploy objects
480480
self.set_application_config(release)
481+
# only buildpack apps need access to object storage
482+
if release.build.type == 'buildpack':
483+
self.create_object_store_secret()
481484

482485
# gather all proc types to be deployed
483486
tasks = [
@@ -1084,3 +1087,10 @@ def set_application_config(self, release):
10841087
self._scheduler.secret.create(self.id, secret_name, secrets_env, labels=labels)
10851088
else:
10861089
self._scheduler.secret.update(self.id, secret_name, secrets_env, labels=labels)
1090+
1091+
def create_object_store_secret(self):
1092+
try:
1093+
self._scheduler.secret.get(self.id, 'objectstorage-keyfile')
1094+
except KubeException:
1095+
secret = self._scheduler.secret.get('deis', 'objectstorage-keyfile').json()
1096+
self._scheduler.secret.create(self.id, 'objectstorage-keyfile', secret['data'])

rootfs/scheduler/resources/pod.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,6 @@ def manifest(self, namespace, name, image, **kwargs):
133133

134134
# Check if it is a slug builder image.
135135
if build_type == "buildpack":
136-
# only buildpack apps need access to object storage
137-
try:
138-
self.secret.get(namespace, 'objectstorage-keyfile')
139-
except KubeException:
140-
secret = self.secret.get('deis', 'objectstorage-keyfile').json()
141-
self.secret.create(namespace, 'objectstorage-keyfile', secret['data'])
142-
143136
# add the required volume to the top level pod spec
144137
spec['volumes'] = [{
145138
'name': 'objectstorage-keyfile',

0 commit comments

Comments
 (0)