From 433d8fbcc6628a1e331388ae0676d0735e46142c Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 10 Feb 2018 21:53:23 +0100 Subject: generate flumotion worker services --- src/examples/elevate2018.yml | 1 - src/flufigut.py | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/examples/elevate2018.yml b/src/examples/elevate2018.yml index daa4abe..4c40a5d 100644 --- a/src/examples/elevate2018.yml +++ b/src/examples/elevate2018.yml @@ -92,7 +92,6 @@ streams: type: http count: 4 port: 8000 - interface: localhost max-bw: 290000000 burst-on-connect: 5 hostname: "elevate-live%i.spreadspace.org" diff --git a/src/flufigut.py b/src/flufigut.py index d0de644..a20f014 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -415,11 +415,12 @@ class Planet: comp_name = '%s-%s%i-port-%s-%i' % (protocol, stream, idx + 1, interface, port) addr = '%s:%i' % (interface, port) + worker = self.__get_worker(comp_name) porter = Porter(comp_name, interface, port) self.atmosphere[porter.name] = { 'type': "porter", 'desc': "%s porter %s%i on %s" % (protocol, stream, idx + 1, addr), - 'worker': str(self.__get_worker(comp_name)), + 'worker': str(worker), 'properties': { 'port': port, 'socket-path': porter.socket_path, @@ -430,6 +431,7 @@ class Planet: if interface: self.atmosphere[porter.name]['properties']['interface'] = interface + self.__add_worker_flag(worker, "port", port) return porter def __generate_stream_mux_repeater(self, stream, mux, format, profile, feeder): @@ -651,6 +653,10 @@ class K8sDeployment: secret['data']['password'] = base64.b64encode(worker['password'].encode('utf-8')).decode('ascii') v1.create_namespaced_secret(self._namespace, secret) + if 'port' in worker['flags']: + svc = self.__generate_object(tmpl_env, 'flumotion-worker-svc.yml', worker) + v1.create_namespaced_service(self._namespace, svc) + deploy = self.__generate_object(tmpl_env, 'flumotion-worker-deploy.yml', worker) appsV1.create_namespaced_deployment(self._namespace, deploy) -- cgit v1.2.3