diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/examples/elevate2018.yml | 4 | ||||
| -rwxr-xr-x | src/flufigut.py | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/examples/elevate2018.yml b/src/examples/elevate2018.yml index 8dfc7c4..e6583d2 100644 --- a/src/examples/elevate2018.yml +++ b/src/examples/elevate2018.yml @@ -99,6 +99,8 @@ streams: max-con: 100 burst-on-connect: 5 hostname: elevate-feed.spreadspace.org + site-hostname: elevate-feed.spreadspace.org + site-worker: helene public: muxes: [ av-orig, audio-orig ] nginx-muxes: [ av-orig ] @@ -110,8 +112,10 @@ streams: hostname: "emc-%02i.spreadspace.org" repeater: True lb-hostname: "elevate-live.spreadspace.org" + lb-worker: emc-00 onion-service: "elevateh7tpoo7eg.onion" site-hostname: "stream.elevate.at" + site-worker: emc-00 records: av: mux: avr diff --git a/src/flufigut.py b/src/flufigut.py index 638075d..8ef5378 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -796,8 +796,18 @@ class K8sDeployment: deploy = self.__generate_object(tmpl_env, 'stream-lb-deploy.yml', {'stream': stream_name, 'streamers': streamers}) appsV1.create_namespaced_deployment(self._namespace, deploy) - def _deploy_stream_website(self, template_dir, tmpl_env, v1, appsV1, stream_name, stream): - # TODO: add me + def _deploy_stream_website(self, template_dir, tmpl_env, v1, appsV1, extV1beta1, stream_name, stream): + cm = self.__generate_object(tmpl_env, 'stream-site-cm.yml', {'stream': stream_name}) + v1.create_namespaced_config_map(self._namespace, cm) + + svc = self.__generate_object(tmpl_env, 'stream-site-svc.yml', {'stream': stream_name}) + v1.create_namespaced_service(self._namespace, svc) + + deploy = self.__generate_object(tmpl_env, 'stream-site-deploy.yml', {'stream': stream_name}) + appsV1.create_namespaced_deployment(self._namespace, deploy) + + ingress = self.__generate_object(tmpl_env, 'stream-site-ingress.yml', {'stream': stream_name}) + extV1beta1.create_namespaced_ingress(self._namespace, ingress) pass def _deploy_onionbalance(self, template_dir, tmpl_env, v1, appsV1, rbacV1): @@ -824,6 +834,7 @@ class K8sDeployment: def deploy(self, template_dir): v1 = kubernetes.client.CoreV1Api() appsV1 = kubernetes.client.AppsV1Api() + extV1beta1 = kubernetes.client.ExtensionsV1beta1Api() rbacV1 = kubernetes.client.RbacAuthorizationV1Api() self.__create_namespace(v1) @@ -848,7 +859,7 @@ class K8sDeployment: self._deploy_stream_loadbalancer(template_dir, tmpl_env, v1, appsV1, stream_name, stream) if 'onion-service' in stream: self._deploy_onion_service_config(template_dir, tmpl_env, v1, stream_name, stream) - self._deploy_stream_website(template_dir, tmpl_env, v1, appsV1, stream_name, stream) + self._deploy_stream_website(template_dir, tmpl_env, v1, appsV1, extV1beta1, stream_name, stream) if self.__has_onion_service: role = self.__generate_object(tmpl_env, 'onion-service-role.yml') |