From 3316f0f9581e10230d392180cb6fa922ffe09fa0 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Wed, 16 Nov 2016 23:10:03 +0300
Subject: [PATCH] Allow jobs to specify own volumes

This will be needed for backup jobs which are the only jobs that need
backup volume mounted.

Change-Id: I3ea3cb4342f66da4ead91e945baaddd799522bcf
---
 fuel_ccp/deploy.py    |  2 ++
 fuel_ccp/templates.py | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/fuel_ccp/deploy.py b/fuel_ccp/deploy.py
index 1040eba1..80352945 100644
--- a/fuel_ccp/deploy.py
+++ b/fuel_ccp/deploy.py
@@ -469,6 +469,8 @@ def create_upgrade_jobs(component_name, upgrade_data, configmaps):
         job = {"name": job_name, "type": "single"}
         if step.get('files'):
             job['files'] = step['files']
+        if step.get('volumes'):
+            job['volumes'] = step['volumes']
         jobs.append(job)
         workflow = {
             'name': job_name,
diff --git a/fuel_ccp/templates.py b/fuel_ccp/templates.py
index 099511bc..9a7a3479 100644
--- a/fuel_ccp/templates.py
+++ b/fuel_ccp/templates.py
@@ -1,3 +1,4 @@
+import itertools
 import json
 
 from fuel_ccp import config
@@ -47,7 +48,9 @@ def serialize_configmap(name, data):
     }
 
 
-def serialize_volume_mounts(container):
+def serialize_volume_mounts(container, for_job=None):
+    if for_job is None:
+        for_job = {}
     spec = [
         {
             "name": GLOBAL_CONFIG,
@@ -70,7 +73,8 @@ def serialize_volume_mounts(container):
             "mountPath": "/etc/ccp/%s" % FILES_CONFIG
         }
     ]
-    for v in container.get("volumes", ()):
+    for v in itertools.chain(container.get("volumes", ()),
+                             for_job.get("volumes", ())):
         spec.append({
             "name": v["name"],
             "mountPath": v.get("mount-path", v["path"]),
@@ -150,7 +154,7 @@ def serialize_job_container_spec(container, job):
         "image": images.image_spec(container["image"]),
         "imagePullPolicy": "Always",
         "command": _get_start_cmd(job["name"]),
-        "volumeMounts": serialize_volume_mounts(container),
+        "volumeMounts": serialize_volume_mounts(container, job),
         "env": serialize_env_variables(container)
     }
 
@@ -162,7 +166,7 @@ def serialize_job_pod_spec(service, job, cont_spec):
         },
         "spec": {
             "containers": [cont_spec],
-            "volumes": serialize_volumes(service),
+            "volumes": serialize_volumes(service, job),
             "restartPolicy": "OnFailure"
         }
     }
@@ -184,7 +188,9 @@ def serialize_daemon_pod_spec(service):
     return cont_spec
 
 
-def serialize_volumes(service):
+def serialize_volumes(service, for_job=None):
+    if for_job is None:
+        for_job = {}
     workflow_items = []
     for cont in service["containers"]:
         workflow_items.append(
@@ -247,7 +253,7 @@ def serialize_volumes(service):
     ]
     volume_names = [GLOBAL_CONFIG, META_CONFIG, ROLE_CONFIG, SCRIPT_CONFIG,
                     FILES_CONFIG]
-    for cont in service["containers"]:
+    for cont in itertools.chain(service["containers"], [for_job]):
         for v in cont.get("volumes", ()):
             if v["name"] in volume_names:
                 # TODO(apavlov): move to validation