diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2018-02-18 00:56:38 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2018-02-18 00:56:38 +0100 |
| commit | 9c7008feb5f182f2e1fa0be3cc20ccd04d13a6e2 (patch) | |
| tree | e697005ef2f4ff7e386df8e46bc983831298fb9a | |
| parent | hardcoded values for s5proxy work now (diff) | |
added sfive hub to proxy
| -rw-r--r-- | src/examples/elevate2018.yml | 4 | ||||
| -rwxr-xr-x | src/flufigut.py | 8 | ||||
| -rw-r--r-- | templates/default/kubernetes/sfive-proxy-deploy.yml.j2 | 25 |
3 files changed, 33 insertions, 4 deletions
diff --git a/src/examples/elevate2018.yml b/src/examples/elevate2018.yml index 61f9e51..443df97 100644 --- a/src/examples/elevate2018.yml +++ b/src/examples/elevate2018.yml @@ -13,8 +13,8 @@ globals: password: change-me stats: sfive-proxy: - socket: "/var/run/sfive/pipegram" - duration: 15 + socket: "/srv/hub.sock" + duration: 15s tags: [ "elevate", "2018", "discourse" ] resolutions: 1080p25: { width: 1920, height: 1080, rate: 25/1 } diff --git a/src/flufigut.py b/src/flufigut.py index 9cc08ce..208d742 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -721,6 +721,14 @@ class K8sDeployment: proxy_conf['backends'] = {} proxy_conf['backends']['/hls/'] = {'connect': 'http://nginx-streamer-' + worker['name'] + ':8000'} proxy_conf['backends']['/dash/'] = {'connect': 'http://nginx-streamer-' + worker['name'] + ':8000'} + + proxy_conf['sfive'] = {'hostname': worker['name']} + proxy_conf['sfive']['socket'] = self._desc.globals['stats']['sfive-proxy']['socket'] + proxy_conf['sfive']['duration'] = self._desc.globals['stats']['sfive-proxy']['duration'] + proxy_conf['sfive']['tags'] = self._desc.globals['stats']['sfive-proxy']['tags'] + proxy_conf['sfive']['matches'] = [{'format': '/${content}-${format}-${quality}', 'streams': 'av-orig/flash,webm/high,medium,low,mini'}, + {'format': '/${format}/${content}-${quality}', 'streams': 'av-orig/dash,hls/high,medium,low,mini'}] + cm = self.__generate_object(tmpl_env, 'sfive-proxy-cm.yml', worker) cm['data']['proxy.json'] = json.dumps(proxy_conf) v1.create_namespaced_config_map(self._namespace, cm) diff --git a/templates/default/kubernetes/sfive-proxy-deploy.yml.j2 b/templates/default/kubernetes/sfive-proxy-deploy.yml.j2 index 121d80e..62ed9fe 100644 --- a/templates/default/kubernetes/sfive-proxy-deploy.yml.j2 +++ b/templates/default/kubernetes/sfive-proxy-deploy.yml.j2 @@ -41,12 +41,33 @@ spec: volumeMounts: - name: home mountPath: /srv - - name: sfive-config + - 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: sfive-config + - name: proxy-config configMap: name: sfive-proxy-{{ worker.name }} + - name: hub-data + hostPath: + type: DirectoryOrCreate + path: /var/lib/sfive/{{ desc.globals.name }} |