diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2018-02-18 23:09:27 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2018-02-18 23:09:27 +0100 |
| commit | 7ae2c0a221dae2368844e32a5646e0d94b48c37a (patch) | |
| tree | 0e7e46337d229ddf74077965e8bbf051cfbb50da /src | |
| parent | onion service works now (diff) | |
onionbalance should be working now
Diffstat (limited to 'src')
| -rw-r--r-- | src/examples/elevate2018.yml | 4 | ||||
| -rwxr-xr-x | src/flufigut.py | 24 |
2 files changed, 24 insertions, 4 deletions
diff --git a/src/examples/elevate2018.yml b/src/examples/elevate2018.yml index ba84345..6d193e9 100644 --- a/src/examples/elevate2018.yml +++ b/src/examples/elevate2018.yml @@ -59,6 +59,8 @@ globals: nginx_image_version: 4 sfive_image_version: 2 onion_service_image_version: master-23 + onionbalance_image_version: master-16 + onionbalance_worker: emc-00 inputs: sdi-orig: type: decklink @@ -107,7 +109,7 @@ streams: burst-on-connect: 5 hostname: "emc-%02i.spreadspace.org" repeater: True - onion-service: "dear-nicoo-this-is-just-a-place-holder-for-now.onion" + onion-service: "elevateynzm6opkp.onion" records: av: mux: avr diff --git a/src/flufigut.py b/src/flufigut.py index 0289abd..7117318 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -764,6 +764,23 @@ class K8sDeployment: deploy = self.__generate_object(tmpl_env, 'sfive-deploy.yml', worker) appsV1.create_namespaced_deployment(self._namespace, deploy) + def _deploy_onionbalance(self, template_dir, tmpl_env, v1, appsV1, rbacV1): + sa = self.__generate_object(tmpl_env, 'onionbalance-sa.yml') + v1.create_namespaced_service_account(self._namespace, sa) + + role = self.__generate_object(tmpl_env, 'onionbalance-role.yml') + rbacV1.create_namespaced_role(self._namespace, role) + + rb = self.__generate_object(tmpl_env, 'onionbalance-rolebinding.yml') + rbacV1.create_namespaced_role_binding(self._namespace, rb) + + secret = self.__generate_object(tmpl_env, 'onionbalance-secret.yml') + v1.create_namespaced_secret(self._namespace, secret) + + worker = self._planet.workers[self._desc.globals['deployment']['parameter']['onionbalance_worker']] + deploy = self.__generate_object(tmpl_env, 'onionbalance-deploy.yml', worker) + appsV1.create_namespaced_deployment(self._namespace, deploy) + def deploy(self, template_dir): v1 = kubernetes.client.CoreV1Api() appsV1 = kubernetes.client.AppsV1Api() @@ -785,15 +802,16 @@ class K8sDeployment: self._deploy_sfive_worker(template_dir, tmpl_env, v1, appsV1, worker) if self.__has_onion_service: - role = self.__generate_object(tmpl_env, 'onion-service-role.yml', worker) + role = self.__generate_object(tmpl_env, 'onion-service-role.yml') rbacV1.create_namespaced_role(self._namespace, role) + self._deploy_onionbalance(template_dir, tmpl_env, v1, appsV1, rbacV1) if self.__has_sfive: - sa = self.__generate_object(tmpl_env, 'sfive-sa.yml', worker) + sa = self.__generate_object(tmpl_env, 'sfive-sa.yml') v1.create_namespaced_service_account(self._namespace, sa) if self.__has_sfive_onion: - rb = self.__generate_object(tmpl_env, 'sfive-onion-rolebinding.yml', worker) + rb = self.__generate_object(tmpl_env, 'sfive-onion-rolebinding.yml') rbacV1.create_namespaced_role_binding(self._namespace, rb) def wipe(self): |