From 27922b61e09f5c5850a9dd29cb903857c52fc9db Mon Sep 17 00:00:00 2001 From: Philipp Kolberg Date: Wed, 29 Nov 2023 23:56:14 +0100 Subject: [PATCH] Remove IP family configuration option This shall rather be configured using `kubernetes_json_patch` introduced with https://github.com/goauthentik/authentik/pull/6319 --- authentik/outposts/controllers/k8s/service.py | 6 ------ authentik/outposts/models.py | 2 -- website/docs/outposts/_config.md | 4 ---- website/docs/outposts/integrations/kubernetes.md | 2 -- 4 files changed, 14 deletions(-) diff --git a/authentik/outposts/controllers/k8s/service.py b/authentik/outposts/controllers/k8s/service.py index b4e1127e1..0408b0471 100644 --- a/authentik/outposts/controllers/k8s/service.py +++ b/authentik/outposts/controllers/k8s/service.py @@ -34,10 +34,6 @@ class ServiceReconciler(KubernetesObjectReconciler[V1Service]): raise NeedsUpdate() if current.spec.type != reference.spec.type: raise NeedsUpdate() - if current.spec.ip_family_policy != reference.spec.ip_family_policy: - raise NeedsUpdate() - if current.spec.ip_families != reference.spec.ip_families: - raise NeedsUpdate() super().reconcile(current, reference) def get_reference_object(self) -> V1Service: @@ -66,8 +62,6 @@ class ServiceReconciler(KubernetesObjectReconciler[V1Service]): ports=ports, selector=selector_labels, type=self.controller.outpost.config.kubernetes_service_type, - ip_family_policy=self.controller.outpost.config.kubernetes_service_ip_family_policy, - ip_families=self.controller.outpost.config.kubernetes_service_ip_families, ), ) diff --git a/authentik/outposts/models.py b/authentik/outposts/models.py index 1d4193b09..14f896c35 100644 --- a/authentik/outposts/models.py +++ b/authentik/outposts/models.py @@ -73,8 +73,6 @@ class OutpostConfig: kubernetes_ingress_secret_name: str = field(default="authentik-outpost-tls") kubernetes_ingress_class_name: Optional[str] = field(default=None) kubernetes_service_type: str = field(default="ClusterIP") - kubernetes_service_ip_family_policy: Optional[str] = field(default="SingleStack") - kubernetes_service_ip_families: list[str] = field(default_factory=list) kubernetes_disabled_components: list[str] = field(default_factory=list) kubernetes_image_pull_secrets: list[str] = field(default_factory=list) kubernetes_json_patches: Optional[dict[str, list[dict[str, Any]]]] = field(default=None) diff --git a/website/docs/outposts/_config.md b/website/docs/outposts/_config.md index 72c1753a6..021ee8646 100644 --- a/website/docs/outposts/_config.md +++ b/website/docs/outposts/_config.md @@ -47,10 +47,6 @@ kubernetes_ingress_annotations: {} kubernetes_ingress_secret_name: authentik-outpost-tls # Service kind created, can be set to LoadBalancer for LDAP outposts for example kubernetes_service_type: ClusterIP -# Service IP family policy, can be SingleStack, PreferDualStack or RequireDualStack -kubernetes_service_ip_family_policy: SingleStack -# Service IP families, can be any combination of 'IPv4' and 'IPv6' -kubernetes_service_ip_families: [] # Disable any components of the kubernetes integration, can be any of # - 'secret' # - 'deployment' diff --git a/website/docs/outposts/integrations/kubernetes.md b/website/docs/outposts/integrations/kubernetes.md index cbfc8ee61..557504130 100644 --- a/website/docs/outposts/integrations/kubernetes.md +++ b/website/docs/outposts/integrations/kubernetes.md @@ -25,8 +25,6 @@ The following outpost settings are used: - `kubernetes_ingress_secret_name`: Name of the secret that is used for TLS connections, can be empty to disable TLS config - `kubernetes_ingress_class_name`: Optionally set the ingress class used for the generated ingress, requires authentik 2022.11.0 - `kubernetes_service_type`: Service kind created, can be set to LoadBalancer for LDAP outposts for example -- `kubernetes_service_ip_family_policy`: IP family policy that is applied to the service -- `kubernetes_service_ip_families`: Specify which IP families the service will use - `kubernetes_disabled_components`: Disable any components of the kubernetes integration, can be any of - 'secret' - 'deployment'