Merge pull request #871 from helgi/sortenv

feat(scheduler): sort env vars and secrets by keys for easier hashing

Author: helgi

rootfs/scheduler/__init__.py

@@ -1,6 +1,8 @@
+from collections import OrderedDict
 from datetime import datetime, timedelta
 import json
 import logging
+import operator
 import os
 import string
 import time
@@ -445,6 +447,9 @@ def _set_container(self, namespace, container_name, data, **kwargs):  # noqa
                 for key, value in env.items():
                     secrets_env[key.lower().replace('_', '-')] = str(value)
 
+                # dictionary sorted by key
+                secrets_env = OrderedDict(sorted(secrets_env.items(), key=lambda t: t[0]))
+
                 secret_name = "{}-{}-env".format(namespace, kwargs.get('version'))
                 self.get_secret(namespace, secret_name)
             except KubeHTTPException:
@@ -478,6 +483,9 @@ def _set_container(self, namespace, container_name, data, **kwargs):  # noqa
                 "value": "1"
             })
 
+        # list sorted by dict key name
+        data['env'].sort(key=operator.itemgetter('name'))
+
         if mem or cpu:
             data["resources"] = {"limits": {}}