diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2018-02-26 23:51:19 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2018-02-26 23:51:19 +0100 |
| commit | 267a928cba051af398ff739e6c8d36d8d2a6289e (patch) | |
| tree | c66f6605adea42db3f4ea5b01569be49b3031fbb | |
| parent | new www stuff (diff) | |
move secret handling outside of flufigut for now
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | src/flufigut.py | 12 | ||||
| -rwxr-xr-x | src/update.sh | 10 |
3 files changed, 18 insertions, 5 deletions
@@ -1,3 +1,4 @@ src/output src/id_rsa* src/old +src/secrets/ diff --git a/src/flufigut.py b/src/flufigut.py index 8ef5378..5af4285 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -806,6 +806,8 @@ class K8sDeployment: deploy = self.__generate_object(tmpl_env, 'stream-site-deploy.yml', {'stream': stream_name}) appsV1.create_namespaced_deployment(self._namespace, deploy) + # TODO: install TLS secrets + ingress = self.__generate_object(tmpl_env, 'stream-site-ingress.yml', {'stream': stream_name}) extV1beta1.create_namespaced_ingress(self._namespace, ingress) pass @@ -820,12 +822,12 @@ class K8sDeployment: 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') + # secret = self.__generate_object(tmpl_env, 'onionbalance-secret.yml') # TODO: for _, stream in self._desc.streams: - # if 'onion-service' in stream: - # key = ~~~~get_key(stream['onion-service']) - # secret['data'][stream['onion-service']] = base64.b64encode(key).decode('ascii') - v1.create_namespaced_secret(self._namespace, secret) + # if 'onion-service' in stream: + # key = ~~~~get_key(stream['onion-service']) + # secret['data'][stream['onion-service']] = base64.b64encode(key).decode('ascii') + # 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': worker}) diff --git a/src/update.sh b/src/update.sh new file mode 100755 index 0000000..615758c --- /dev/null +++ b/src/update.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +./flufigut.py examples/elevate2018.yml + +kubectl create -f secrets/stream-site-public-tls.yml +kubectl create -f secrets/stream-site-local-tls.yml +kubectl create -f secrets/onionbalance.yml + +exit 0 + |