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

providers/proxy: don't create ingress when no hosts are defined 

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-08-08 21:46:05 +02:00
parent ebc6afe015
commit 665c1aa81b
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
authentik/providers/proxy/controllers/k8s/ingress.py
View File

@ -14,7 +14,11 @@ from kubernetes.client import (
from kubernetes.client.models.networking_v1beta1_ingress_rule import NetworkingV1beta1IngressRule from kubernetes.client.models.networking_v1beta1_ingress_rule import NetworkingV1beta1IngressRule
from authentik.outposts.controllers.base import FIELD_MANAGER from authentik.outposts.controllers.base import FIELD_MANAGER
from authentik.outposts.controllers.k8s.base import KubernetesObjectReconciler, NeedsUpdate from authentik.outposts.controllers.k8s.base import (
KubernetesObjectReconciler,
NeedsRecreate,
NeedsUpdate,
)
from authentik.providers.proxy.models import ProxyMode, ProxyProvider from authentik.providers.proxy.models import ProxyMode, ProxyProvider
if TYPE_CHECKING: if TYPE_CHECKING:
@ -66,6 +70,10 @@ class IngressReconciler(KubernetesObjectReconciler[NetworkingV1beta1Ingress]):
raise NeedsUpdate() raise NeedsUpdate()
if have_hosts_tls != expected_hosts_tls: if have_hosts_tls != expected_hosts_tls:
raise NeedsUpdate() raise NeedsUpdate()
# If we have a current ingress, which wouldn't have any hosts, raise
# NeedsRecreate() so that its deleted, and check hosts on create
if len(have_hosts) < 1:
raise NeedsRecreate()
def get_ingress_annotations(self) -> dict[str, str]: def get_ingress_annotations(self) -> dict[str, str]:
"""Get ingress annotations""" """Get ingress annotations"""
@ -141,6 +149,9 @@ class IngressReconciler(KubernetesObjectReconciler[NetworkingV1beta1Ingress]):
) )
def create(self, reference: NetworkingV1beta1Ingress): def create(self, reference: NetworkingV1beta1Ingress):
if len(reference.spec.rules) < 1:
self.logger.debug("No hosts defined, not creating ingress.")
return None
return self.api.create_namespaced_ingress( return self.api.create_namespaced_ingress(
self.namespace, reference, field_manager=FIELD_MANAGER self.namespace, reference, field_manager=FIELD_MANAGER
) )