trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

outposts: fix Kubernetes Controller not exporting dicts, secrets not being b64 encoded

Browse source
This commit is contained in:
Jens Langhammer 2020-09-13 22:19:26 +02:00
parent 7fe9b8f0b4
commit a8744f443c
3 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.bumpversion.cfg
View file

@ -10,7 +10,7 @@ tag_name = version/{new_version}
[bumpversion:part:release]
optional_value = stable
first_value = beta
values =
values =
alpha
beta
stable
@ -19,6 +19,8 @@ values =
[bumpversion:file:docs/installation/docker-compose.md]
[bumpversion:file:docs/installation/kubernetes.md]
[bumpversion:file:docker-compose.yml]
[bumpversion:file:helm/values.yaml]

27
passbook/outposts/controllers/kubernetes.py
View file

@ -1,4 +1,5 @@
"""Kubernetes deployment controller"""
from base64 import b64encode
from io import StringIO
from kubernetes.client import (
@ -24,6 +25,11 @@ from passbook import __version__
from passbook.outposts.controllers.base import BaseController
def b64encode_str(input_string: str) -> str:
"""base64 encode string"""
return b64encode(input_string.encode()).decode()
class KubernetesController(BaseController):
"""Manage deployment of outpost in kubernetes"""
@ -37,9 +43,9 @@ class KubernetesController(BaseController):
with StringIO() as _str:
dump_all(
[
self.get_deployment_secret(),
self.get_deployment(),
self.get_service(),
self.get_deployment_secret().to_dict(),
self.get_deployment().to_dict(),
self.get_service().to_dict(),
],
stream=_str,
default_flow_style=False,
@ -63,15 +69,18 @@ class KubernetesController(BaseController):
def get_deployment_secret(self) -> V1Secret:
"""Get secret with token and passbook host"""
return V1Secret(
api_version="v1",
kind="secret",
type="Opaque",
metadata=self.get_object_meta(
name=f"passbook-outpost-{self.outpost.name}-api"
),
data={
"passbook_host": self.outpost.config.passbook_host,
"passbook_host_insecure": str(
self.outpost.config.passbook_host_insecure
"passbook_host": b64encode_str(self.outpost.config.passbook_host),
"passbook_host_insecure": b64encode_str(
str(self.outpost.config.passbook_host_insecure)
),
"token": self.outpost.token.token_uuid.hex,
"token": b64encode_str(self.outpost.token.token_uuid.hex),
},
)
@ -82,6 +91,8 @@ class KubernetesController(BaseController):
for port_name, port in self.deployment_ports.items():
ports.append(V1ServicePort(name=port_name, port=port))
return V1Service(
api_version="v1",
kind="service",
metadata=meta,
spec=V1ServiceSpec(ports=ports, selector=meta.labels, type="ClusterIP"),
)
@ -94,6 +105,8 @@ class KubernetesController(BaseController):
container_ports.append(V1ContainerPort(container_port=port, name=port_name))
meta = self.get_object_meta(name=f"passbook-outpost-{self.outpost.name}")
return V1Deployment(
api_version="apps/v1",
kind="deployment",
metadata=meta,
spec=V1DeploymentSpec(
replicas=1,

5
passbook/outposts/models.py
View file

@ -1,7 +1,6 @@
"""Outpost models"""
from dataclasses import asdict, dataclass
from datetime import datetime
from json import dumps, loads
from typing import Iterable, Optional
from uuid import uuid4
@ -84,12 +83,12 @@ class Outpost(models.Model):
@property
def config(self) -> OutpostConfig:
"""Load config as OutpostConfig object"""
return from_dict(OutpostConfig, loads(self._config))
return from_dict(OutpostConfig, self._config)
@config.setter
def config(self, value):
"""Dump config into json"""
self._config = dumps(asdict(value))
self._config = asdict(value)
@property
def health_cache_key(self) -> str: