Merge pull request #50 from totem/develop

0.4.1 Release

Author: sukrit007

Dockerfile

@@ -9,7 +9,7 @@ RUN apt-get update --fix-missing && apt-get install -y \
     && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
 
 # Etcdctl
-ENV ETCDCTL_VERSION v0.4.6
+ENV ETCDCTL_VERSION v2.2.5
 RUN curl -L https://github.com/coreos/etcd/releases/download/$ETCDCTL_VERSION/etcd-$ETCDCTL_VERSION-linux-amd64.tar.gz -o /tmp/etcd-$ETCDCTL_VERSION-linux-amd64.tar.gz && \
     cd /tmp && gzip -dc etcd-$ETCDCTL_VERSION-linux-amd64.tar.gz | tar -xof - && \
     cp -f /tmp/etcd-$ETCDCTL_VERSION-linux-amd64/etcdctl /usr/local/bin && \

orchestrator/__init__.py

@@ -2,7 +2,7 @@
 from celery.signals import setup_logging
 import orchestrator.logger
 
-__version__ = '0.4.0'
+__version__ = '0.4.1'
 __author__ = 'sukrit'
 
 orchestrator.logger.init_logging()

orchestrator/tasks/job.py

@@ -462,7 +462,8 @@ def _deploy(self, job, deployer_name):
         'deployment': dict_merge(deployer['deployment']),
         'security': job_config.get('security', {}),
         'notifications': job_config.get('notifications', {}),
-        'environment': job_config.get('environment', {})
+        'environment': job_config.get('environment', {}),
+        'schedule': job_config.get('schedule', ''),
     }
     try:
         response = requests.post(apps_url, data=json.dumps(data),

requirements.txt

@@ -10,7 +10,7 @@ pymongo==3.0.3
 Jinja2==2.7.3
 requests[security]==2.7.0
 urllib3==1.11
-https://github.com/sukrit007/celery/archive/3.1.tar.gz
+celery[mongodb]==3.1.20
 https://github.com/totem/flask-hyperschema/archive/v0.1.1.tar.gz
 https://github.com/totem/totem-encrypt/archive/master.tar.gz
 https://github.com/dlitz/pycrypto/archive/v2.7a1.tar.gz

schemas/job-config-evaluated-v1.json

@@ -32,6 +32,10 @@
       "type": "object",
       "$ref": "#/definitions/environment",
       "description": "Defines top level environment (key, value) support"
+    },
+    "schedule": {
+      "type": "string",
+      "description": "Run this deployment as scheduled job."
     }
   },
   "required": ["enabled"],

schemas/job-config-v1.json

@@ -39,6 +39,10 @@
       "type": "object",
       "$ref": "#/definitions/environment",
       "description": "Defines top level environment (key, value) support"
+    },
+    "schedule": {
+      "$ref": "#/definitions/string-or-template-type",
+      "description": "Run this deployment as scheduled job. See: https://www.freedesktop.org/software/systemd/man/systemd.time.html#Calendar%20Events"
     }
   },
   "required": ["enabled"],