habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

outposts: fix error on k8s when name has spaces

Browse Source 
closes #846

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer
2021-05-08 14:09:21 +02:00
parent bf60b33d03
commit 7a1935b4e2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
authentik/outposts/controllers/k8s/base.py
View File

@ -1,6 +1,7 @@
"""Base Kubernetes Reconciler""" """Base Kubernetes Reconciler"""
from typing import TYPE_CHECKING, Generic, TypeVar from typing import TYPE_CHECKING, Generic, TypeVar
from django.utils.text import slugify
from kubernetes.client import V1ObjectMeta from kubernetes.client import V1ObjectMeta
from kubernetes.client.models.v1_deployment import V1Deployment from kubernetes.client.models.v1_deployment import V1Deployment
from kubernetes.client.models.v1_pod import V1Pod from kubernetes.client.models.v1_pod import V1Pod
@ -48,7 +49,7 @@ class KubernetesObjectReconciler(Generic[T]):
def name(self) -> str: def name(self) -> str:
"""Get the name of the object this reconciler manages""" """Get the name of the object this reconciler manages"""
return self.controller.outpost.config.object_naming_template % { return self.controller.outpost.config.object_naming_template % {
"name": self.controller.outpost.name, "name": slugify(self.controller.outpost.name),
"uuid": self.controller.outpost.uuid.hex, "uuid": self.controller.outpost.uuid.hex,
} }
@ -132,7 +133,7 @@ class KubernetesObjectReconciler(Generic[T]):
namespace=self.namespace, namespace=self.namespace,
labels={ labels={
"app.kubernetes.io/name": f"authentik-{self.controller.outpost.type.lower()}", "app.kubernetes.io/name": f"authentik-{self.controller.outpost.type.lower()}",
"app.kubernetes.io/instance": self.controller.outpost.name, "app.kubernetes.io/instance": slugify(self.controller.outpost.name),
"app.kubernetes.io/version": __version__, "app.kubernetes.io/version": __version__,
"app.kubernetes.io/managed-by": "goauthentik.io", "app.kubernetes.io/managed-by": "goauthentik.io",
"goauthentik.io/outpost-uuid": self.controller.outpost.uuid.hex, "goauthentik.io/outpost-uuid": self.controller.outpost.uuid.hex,