From 8eb938f0c8034f9d246351994cd70b3e4f767f92 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 11 Feb 2018 16:50:54 +0100
Subject: add worker flags for streamer

---
 src/examples/elevate2018.yml                                 | 7 ++++++-
 src/flufigut.py                                              | 6 +++++-
 templates/default/kubernetes/flumotion-manager-deploy.yml.j2 | 2 +-
 templates/default/kubernetes/flumotion-worker-deploy.yml.j2  | 2 +-
 templates/default/kubernetes/nginx-streamer-deploy.yml.j2    | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/examples/elevate2018.yml b/src/examples/elevate2018.yml
index 4c40a5d..717263d 100644
--- a/src/examples/elevate2018.yml
+++ b/src/examples/elevate2018.yml
@@ -49,7 +49,8 @@ globals:
   deployment:
     type: kubernetes
     parameter:
-      image_version: 12
+      flumotion_image_version: 12
+      nginx_image_version: 4
 inputs:
   sdi-orig:
     type: decklink
@@ -81,17 +82,21 @@ muxes:
 streams:
   local:
      muxes: [ av-orig, audio-orig ]
+     nginx-muxes: [ av-orig ]
      type: http
      count: 1
      port: 8000
+     nginx-port: 8000
      max-con: 100
      burst-on-connect: 5
      hostname: elevate-feed.spreadspace.org
   public:
      muxes: [ av-orig, audio-orig ]
+     nginx-muxes: [ av-orig ]
      type: http
      count: 4
      port: 8000
+     nginx-port: 8000
      max-bw: 290000000
      burst-on-connect: 5
      hostname: "elevate-live%i.spreadspace.org"
diff --git a/src/flufigut.py b/src/flufigut.py
index 5bdff0a..6be8cb2 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -493,6 +493,8 @@ class Planet:
 
         comp_name = '%s-%s%i-stream-%s-%s-%s' % (stream['type'], stream_name, idx + 1, mux, format, profile)
         mount_point = '/%s-%s-%s.%s' % (mux, format, profile, self._desc.globals['formats'][format]['muxer'])
+        worker = self.__get_worker(comp_name)
+
         hostname = stream['hostname']
         hostname_next = None
         if cnt > 1:
@@ -506,7 +508,7 @@ class Planet:
             'type': "%s-stream" % stream['type'],
             'desc': "%s streamer for %s %s-%s (part %i of %i in %s cluster)" % (
                 stream['type'], mux, format, profile, idx + 1, cnt, stream_name),
-            'worker': str(self.__get_worker(comp_name)),
+            'worker': str(worker),
             'feeder': feeder,
             'properties': {
                 'description': self._desc.globals['description'],
@@ -521,6 +523,8 @@ class Planet:
         }
         self.__set_stream_mux_instance_props(comp_name, stream, porter.port, mount_point, hostname_next)
         self.__add_stream_mux_instance_plugs(comp_name, stream_name, idx, mux, format, profile)
+        self.__add_worker_flag(worker, "stream", stream_name)
+        self.__add_worker_flag(worker, "stream-hostname-%s" % stream_name, hostname)
 
     def __generate_stream_instance(self, stream_name, stream, idx, cnt):
         port = stream['port']
diff --git a/templates/default/kubernetes/flumotion-manager-deploy.yml.j2 b/templates/default/kubernetes/flumotion-manager-deploy.yml.j2
index b48b719..7263341 100644
--- a/templates/default/kubernetes/flumotion-manager-deploy.yml.j2
+++ b/templates/default/kubernetes/flumotion-manager-deploy.yml.j2
@@ -27,7 +27,7 @@ spec:
         fsGroup: 998
       containers:
       - name: flumotion
-        image: spreadspace/flumotion:manager-{{ desc.globals.deployment.parameter.image_version }}
+        image: spreadspace/flumotion:manager-{{ desc.globals.deployment.parameter.flumotion_image_version }}
         imagePullPolicy: Always
         args:
         - --verbose
diff --git a/templates/default/kubernetes/flumotion-worker-deploy.yml.j2 b/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
index f6dfcfd..7079c67 100644
--- a/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
+++ b/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
@@ -31,7 +31,7 @@ spec:
       containers:
 %% for subname, sub in worker.subs.items()
       - name: {{ subname }}
-        image: spreadspace/flumotion:worker-{{ desc.globals.deployment.parameter.image_version }}
+        image: spreadspace/flumotion:worker-{{ desc.globals.deployment.parameter.flumotion_image_version }}
         imagePullPolicy: Always
         env:
         - name: WORKER_PASSWORD
diff --git a/templates/default/kubernetes/nginx-streamer-deploy.yml.j2 b/templates/default/kubernetes/nginx-streamer-deploy.yml.j2
index 857dfcc..2a0fcf2 100644
--- a/templates/default/kubernetes/nginx-streamer-deploy.yml.j2
+++ b/templates/default/kubernetes/nginx-streamer-deploy.yml.j2
@@ -30,7 +30,7 @@ spec:
         fsGroup: 998
       containers:
       - name: nginx
-        image: spreadspace/nginx-streaming
+        image: spreadspace/nginx-streaming:{{ desc.globals.deployment.parameter.nginx_image_version }}
         imagePullPolicy: Always
         args:
         - nginx
-- 
cgit v1.2.3