From 187da84006a3c2a487aa4ed01f98744f32fe2d16 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Wed, 10 Aug 2022 10:32:53 +0300
Subject: [PATCH] fix(authentik): enable services/ports and disable geoip by
 default (#3424)

* fix(authentik): enable services/ports and disable geoip by default

* dedupe port names
---
 charts/incubator/authentik/Chart.yaml          |  2 +-
 charts/incubator/authentik/questions.yaml      |  4 ++--
 charts/incubator/authentik/templates/_ldap.tpl |  2 +-
 charts/incubator/authentik/values.yaml         | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charts/incubator/authentik/Chart.yaml b/charts/incubator/authentik/Chart.yaml
index 070807f9f14..3e9d0e8d6d1 100644
--- a/charts/incubator/authentik/Chart.yaml
+++ b/charts/incubator/authentik/Chart.yaml
@@ -27,7 +27,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/authentik
   - https://github.com/goauthentik/authentik
   - https://goauthentik.io/docs/
-version: 3.0.0
+version: 3.0.1
 annotations:
   truecharts.org/catagories: |
     - authentication
diff --git a/charts/incubator/authentik/questions.yaml b/charts/incubator/authentik/questions.yaml
index e48bf34843d..438726c5c59 100644
--- a/charts/incubator/authentik/questions.yaml
+++ b/charts/incubator/authentik/questions.yaml
@@ -294,7 +294,7 @@ questions:
           description: "Enables GeoIP container"
           schema:
             type: boolean
-            default: true
+            default: false
             show_subquestions_if: true
             subquestions:
               - variable: account_id
@@ -519,7 +519,7 @@ questions:
                                   schema:
                                     type: int
                                     default: 6636
-                    - variable: metrics
+                    - variable: ldap-metrics
                       label: "LDAP metrics Service Port Configuration"
                       schema:
                         additional_attrs: true
diff --git a/charts/incubator/authentik/templates/_ldap.tpl b/charts/incubator/authentik/templates/_ldap.tpl
index f29e4bafa41..3e87f36f96d 100644
--- a/charts/incubator/authentik/templates/_ldap.tpl
+++ b/charts/incubator/authentik/templates/_ldap.tpl
@@ -17,7 +17,7 @@ ports:
   - containerPort: 6636
 {{ if .Values.outposts.ldap.metrics }}
   - containerPort: 9300
-    name: metrics
+    name: ldap-metrics
 {{ end }}
 readinessProbe:
   exec:
diff --git a/charts/incubator/authentik/values.yaml b/charts/incubator/authentik/values.yaml
index 29f1ec43591..05a7575b8a7 100644
--- a/charts/incubator/authentik/values.yaml
+++ b/charts/incubator/authentik/values.yaml
@@ -140,18 +140,18 @@ service:
         port: 10231
         targetPort: 9301
   ldap:
-    enabled: false
+    enabled: true
     ports:
       ldap1:
-        enabled: false
+        enabled: true
         port: 389
         targetPort: 3389
       ldap2:
-        enabled: false
+        enabled: true
         port: 636
         targetPort: 6636
-      metrics:
-        enabled: false
+      ldap-metrics:
+        enabled: true
         port: 10232
         protocol: HTTP
         targetPort: 9300