Skip to content

Commit f2f1cf8

Browse files
author
v-reyder
committed
Fixes for resolve review comments by mboersma
1 parent 81ad7e5 commit f2f1cf8

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

rootfs/api/models/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def set_registry(self):
9292
def set_tags(self, previous_config):
9393
"""verify the tags exist on any nodes as labels"""
9494
if not self.tags:
95-
if settings.DEIS_DEFAULT_CONFIG_TAGS != '':
95+
if settings.DEIS_DEFAULT_CONFIG_TAGS:
9696
try:
9797
tags = json.loads(settings.DEIS_DEFAULT_CONFIG_TAGS)
9898
self.tags = tags

rootfs/api/settings/production.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309

310310
KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT = os.environ.get('KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT', None) # noqa
311311

312-
DEIS_DEFAULT_CONFIG_TAGS = str(os.environ.get('DEIS_DEFAULT_CONFIG_TAGS', ''))
312+
DEIS_DEFAULT_CONFIG_TAGS = os.environ.get('DEIS_DEFAULT_CONFIG_TAGS', '')
313313

314314
# How long k8s waits for a pod to finish work after a SIGTERM before sending SIGKILL
315315
KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS = int(os.environ.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', 30)) # noqa

rootfs/api/settings/testing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939
KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS = int(os.environ.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', 2)) # noqa
4040
KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC = '{"spec":{"hard":{"pods":"10"}}}'
4141

42-
DEIS_DEFAULT_CONFIG_TAGS = str(os.environ.get('DEIS_DEFAULT_CONFIG_TAGS', ''))
42+
DEIS_DEFAULT_CONFIG_TAGS = os.environ.get('DEIS_DEFAULT_CONFIG_TAGS', '')

0 commit comments

Comments
 (0)