From 3e87f673bd262f7808c1fac7b0f853cab71a098d Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 18 Feb 2018 17:44:07 +0100
Subject: revamp handling of sfive proxy

---
 .../default/kubernetes/nginx-streamer-cm.yml.j2    | 11 ++--
 .../default/kubernetes/nginx-streamer-svc.yml.j2   |  2 +-
 templates/default/kubernetes/sfive-cm.yml.j2       |  9 +++
 templates/default/kubernetes/sfive-deploy.yml.j2   | 72 +++++++++++++++++++++
 templates/default/kubernetes/sfive-proxy-cm.yml.j2 | 12 ----
 .../default/kubernetes/sfive-proxy-deploy.yml.j2   | 73 ----------------------
 6 files changed, 86 insertions(+), 93 deletions(-)
 create mode 100644 templates/default/kubernetes/sfive-cm.yml.j2
 create mode 100644 templates/default/kubernetes/sfive-deploy.yml.j2
 delete mode 100644 templates/default/kubernetes/sfive-proxy-cm.yml.j2
 delete mode 100644 templates/default/kubernetes/sfive-proxy-deploy.yml.j2

(limited to 'templates/default')

diff --git a/templates/default/kubernetes/nginx-streamer-cm.yml.j2 b/templates/default/kubernetes/nginx-streamer-cm.yml.j2
index b7a9901..563245c 100644
--- a/templates/default/kubernetes/nginx-streamer-cm.yml.j2
+++ b/templates/default/kubernetes/nginx-streamer-cm.yml.j2
@@ -1,6 +1,3 @@
-%% set flumotion_port = desc.streams[worker.flags.stream].port
-%% set nginx_port = desc.streams[worker.flags.stream]['nginx-port']
-%% set hostname = worker.flags['stream-hostname']
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -38,8 +35,8 @@ data:
       access_log /dev/null;
 
       server {
-        listen {{ nginx_port }} default_server;
-        listen [::]:{{ nginx_port }} default_server;
+        listen {{ desc.streams[worker.flags.stream].port }} default_server;
+        listen [::]:{{ desc.streams[worker.flags.stream].port }} default_server;
         server_name _;
 
         root /srv/www;
@@ -72,7 +69,7 @@ data:
           hls_fragment_naming timestamp;
           hls_fragment_slicing aligned;
           hls_type live;
-          hls_base_url http://{{ hostname }}:{{ nginx_port }}/hls/;
+          hls_base_url http://{{ worker.flags['stream-hostname'] }}:{{ desc.streams[worker.flags.stream].port }}/hls/;
 
 %% for mux in desc.streams[worker.flags.stream]['nginx-muxes']
 %%   for profile in desc.muxes[mux].formats.flash
@@ -97,7 +94,7 @@ data:
         respawn on;
 %% for mux in desc.streams[worker.flags.stream]['nginx-muxes']
 %%   for profile in desc.muxes[mux].formats.flash
-        exec_static ffmpeg -i http://flumotion-worker-{{ worker.name }}:{{ flumotion_port }}/{{ mux }}-flash-{{ profile }}.flv
+        exec_static ffmpeg -i http://flumotion-worker-{{ worker.name }}:{{ desc.streams[worker.flags.stream].port }}/{{ mux }}-flash-{{ profile }}.flv
               -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/hls/{{ mux }}-{{ profile }}
               -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/dash/{{ mux }}-{{ profile }};
 %%   endfor
diff --git a/templates/default/kubernetes/nginx-streamer-svc.yml.j2 b/templates/default/kubernetes/nginx-streamer-svc.yml.j2
index b6bcfe5..9be5ed7 100644
--- a/templates/default/kubernetes/nginx-streamer-svc.yml.j2
+++ b/templates/default/kubernetes/nginx-streamer-svc.yml.j2
@@ -13,4 +13,4 @@ spec:
     type: streamer
     worker: {{ worker.name }}
   ports:
-  - port: {{ desc.streams[worker.flags.stream]['nginx-port'] }}
+  - port: {{ desc.streams[worker.flags.stream].port }}
diff --git a/templates/default/kubernetes/sfive-cm.yml.j2 b/templates/default/kubernetes/sfive-cm.yml.j2
new file mode 100644
index 0000000..dea9222
--- /dev/null
+++ b/templates/default/kubernetes/sfive-cm.yml.j2
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ namespace }}
+  name: sfive-{{ worker.name }}
+  labels:
+    app: sfive
+    worker: {{ worker.name }}
+data:
diff --git a/templates/default/kubernetes/sfive-deploy.yml.j2 b/templates/default/kubernetes/sfive-deploy.yml.j2
new file mode 100644
index 0000000..06c84dc
--- /dev/null
+++ b/templates/default/kubernetes/sfive-deploy.yml.j2
@@ -0,0 +1,72 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: {{ namespace }}
+  name: sfive-{{ worker.name }}
+  labels:
+    app: sfive
+    worker: {{ worker.name }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: sfive
+      worker: {{ worker.name }}
+  strategy:
+    type: Recreate
+  revisionHistoryLimit: 5
+  template:
+    metadata:
+      labels:
+        app: sfive
+        worker: {{ worker.name }}
+    spec:
+      nodeName: {{ worker.name }}
+      securityContext:
+        runAsUser: 998
+        fsGroup: 998
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet
+      containers:
+{% if worker.flags.sfive == 'proxy' %}
+      - name: proxy
+        image: spreadspace/sfive:{{ desc.globals.deployment.parameter.sfive_image_version }}
+        imagePullPolicy: Always
+        args:
+        - s5proxy
+        - -config
+        - /srv/config/proxy.json
+        volumeMounts:
+        - name: home
+          mountPath: /srv
+        - name: proxy-config
+          mountPath: /srv/config
+{% endif %}
+      - name: hub
+        image: spreadspace/sfive:{{ desc.globals.deployment.parameter.sfive_image_version }}
+        imagePullPolicy: Always
+        args:
+        - sfive-hub
+        - -db
+        - /srv/data/db.bolt
+        - -start-pipe-server=false
+        - -start-web-server=false
+        - -start-pipegram-server
+        - -pipegram
+        - /srv/hub.sock
+        volumeMounts:
+        - name: home
+          mountPath: /srv
+        - name: hub-data
+          mountPath: /srv/data
+      volumes:
+      - name: home
+        emptyDir:
+          medium: Memory
+      - name: proxy-config
+        configMap:
+          name: sfive-{{ worker.name }}
+      - name: hub-data
+        hostPath:
+          type: DirectoryOrCreate
+          path: /var/lib/sfive/{{ desc.globals.name }}
diff --git a/templates/default/kubernetes/sfive-proxy-cm.yml.j2 b/templates/default/kubernetes/sfive-proxy-cm.yml.j2
deleted file mode 100644
index e109e85..0000000
--- a/templates/default/kubernetes/sfive-proxy-cm.yml.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  namespace: {{ namespace }}
-  name: sfive-proxy-{{ worker.name }}
-  labels:
-    app: sfive
-    type: proxy
-    worker: {{ worker.name }}
-data:
-  proxy.json: |
-    {}
diff --git a/templates/default/kubernetes/sfive-proxy-deploy.yml.j2 b/templates/default/kubernetes/sfive-proxy-deploy.yml.j2
deleted file mode 100644
index 62ed9fe..0000000
--- a/templates/default/kubernetes/sfive-proxy-deploy.yml.j2
+++ /dev/null
@@ -1,73 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  namespace: {{ namespace }}
-  name: sfive-proxy-{{ worker.name }}
-  labels:
-    app: sfive
-    type: proxy
-    worker: {{ worker.name }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: sfive
-      type: proxy
-      worker: {{ worker.name }}
-  strategy:
-    type: Recreate
-  revisionHistoryLimit: 5
-  template:
-    metadata:
-      labels:
-        app: sfive
-        type: proxy
-        worker: {{ worker.name }}
-    spec:
-      nodeName: {{ worker.name }}
-      securityContext:
-        runAsUser: 998
-        fsGroup: 998
-      hostNetwork: true
-      dnsPolicy: ClusterFirstWithHostNet
-      containers:
-      - name: proxy
-        image: spreadspace/sfive:{{ desc.globals.deployment.parameter.sfive_image_version }}
-        imagePullPolicy: Always
-        args:
-        - s5proxy
-        - -config
-        - /srv/config/proxy.json
-        volumeMounts:
-        - name: home
-          mountPath: /srv
-        - name: proxy-config
-          mountPath: /srv/config
-      - name: hub
-        image: spreadspace/sfive:{{ desc.globals.deployment.parameter.sfive_image_version }}
-        imagePullPolicy: Always
-        args:
-        - sfive-hub
-        - -db
-        - /srv/data/db.bolt
-        - -start-pipe-server=false
-        - -start-web-server=false
-        - -start-pipegram-server
-        - -pipegram
-        - /srv/hub.sock
-        volumeMounts:
-        - name: home
-          mountPath: /srv
-        - name: hub-data
-          mountPath: /srv/data
-      volumes:
-      - name: home
-        emptyDir:
-          medium: Memory
-      - name: proxy-config
-        configMap:
-          name: sfive-proxy-{{ worker.name }}
-      - name: hub-data
-        hostPath:
-          type: DirectoryOrCreate
-          path: /var/lib/sfive/{{ desc.globals.name }}
-- 
cgit v1.2.3