Merge pull request #1249 from rvadim/add-default-tags

feat(config.py): Add ability to setup default tags for applications

Author: mboersma

rootfs/api/models/config.py

@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.db import models
 from jsonfield import JSONField
+import json
 
 from api.models.release import Release
 from api.models import UuidAuditedModel
@@ -91,7 +92,14 @@ def set_registry(self):
     def set_tags(self, previous_config):
         """verify the tags exist on any nodes as labels"""
         if not self.tags:
-            return
+            if settings.DEIS_DEFAULT_CONFIG_TAGS:
+                try:
+                    tags = json.loads(settings.DEIS_DEFAULT_CONFIG_TAGS)
+                    self.tags = tags
+                except json.JSONDecodeError as e:
+                    return
+            else:
+                return
 
         # Get all nodes with label selectors
         nodes = self._scheduler.node.get(labels=self.tags).json()
@@ -174,6 +182,6 @@ def save(self, **kwargs):
             self.set_registry()
             self.set_tags(previous_config)
         except Config.DoesNotExist:
-            pass
+            self.set_tags({'tags': {}})
 
         return super(Config, self).save(**kwargs)

rootfs/api/settings/production.py

@@ -309,6 +309,8 @@
 
 KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT = os.environ.get('KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT', None)  # noqa
 
+DEIS_DEFAULT_CONFIG_TAGS = os.environ.get('DEIS_DEFAULT_CONFIG_TAGS', '')
+
 # How long k8s waits for a pod to finish work after a SIGTERM before sending SIGKILL
 KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS = int(os.environ.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', 30))  # noqa
 

rootfs/api/settings/testing.py

@@ -1,5 +1,6 @@
 import random
 import string
+import os
 
 from api.settings.production import DATABASES
 from api.settings.production import *  # noqa
@@ -37,3 +38,5 @@
 # How long k8s waits for a pod to finish work after a SIGTERM before sending SIGKILL
 KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS = int(os.environ.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', 2))  # noqa
 KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC = '{"spec":{"hard":{"pods":"10"}}}'
+
+DEIS_DEFAULT_CONFIG_TAGS = os.environ.get('DEIS_DEFAULT_CONFIG_TAGS', '')

rootfs/api/tests/test_config.py

@@ -8,6 +8,7 @@
 
 from django.contrib.auth.models import User
 from django.core.cache import cache
+from django.conf import settings
 from unittest import mock
 from rest_framework.authtoken.models import Token
 
@@ -36,6 +37,8 @@ def setUp(self):
         self.app = App.objects.all()[0]
 
     def tearDown(self):
+        # Restore default tags to empty string
+        settings.DEIS_DEFAULT_CONFIG_TAGS = ''
         # make sure every test has a clean slate for k8s mocking
         cache.clear()
 
@@ -120,6 +123,37 @@ def test_config(self, mock_requests):
         self.assertEqual(response.status_code, 405, response.data)
         return config5
 
+    def test_default_tags(self, mock_requests):
+        settings.DEIS_DEFAULT_CONFIG_TAGS = '{"ssd": "true"}'
+        app_id = self.create_app()
+        url = "/v2/apps/{app_id}/config".format(**locals())
+
+        response = self.client.get(url)
+        expected = {
+            'owner': self.user.username,
+            'app': app_id,
+            'values': {},
+            'memory': {},
+            'cpu': {},
+            'tags': {'ssd': 'true'},
+            'registry': {}
+        }
+        self.assertDictContainsSubset(expected, response.data)
+
+        # make sure changes not drop tags
+        body = {'values': json.dumps({'PORT': '5001'})}
+        response = self.client.post(url, body)
+        expected = {
+            'owner': self.user.username,
+            'app': app_id,
+            'values': {'PORT': '5001'},
+            'memory': {},
+            'cpu': {},
+            'tags': {'ssd': 'true'},
+            'registry': {}
+        }
+        self.assertDictContainsSubset(expected, response.data)
+
     def test_response_data(self, mock_requests):
         """Test that the serialized response contains only relevant data."""
         app_id = self.create_app()