Merge pull request #3 from goauthentik/rc3

v1.0.0-RC3
goauthentik · May 5, 2021 · 314f3ca · 314f3ca
2 parents 63d4460 + 8fb84d5
commit 314f3ca
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 28 deletions.
diff --git a/charts/authentik/Chart.yaml b/charts/authentik/Chart.yaml
@@ -1,16 +1,21 @@
 apiVersion: v2
-description: authentik is an open-source Identity Provider focused on flexibility and versatility.
+description: authentik is an open-source Identity Provider focused on flexibility and versatility
 name: authentik
 home: https://goauthentik.io
 sources:
   - https://github.com/goauthentik/authentik
   - https://goauthentik.io/docs/
-version: 1.0.0-RC2
+keywords:
+  - proxy
+  - oauth
+  - authentication
+version: 1.0.0-RC3
 appVersion: 2021.4.5
 icon: https://raw.githubusercontent.com/BeryJu/authentik/master/web/icons/icon.svg
 maintainers:
   - name: BeryJu
     email: jens@beryju.org
+    url: https://github.com/BeryJu
   - name: dirtycajunrice
     email: nick@cajun.pro
     url: https://github.com/DirtyCajunRice
@@ -27,6 +32,18 @@ dependencies:
     repository: https://library-charts.k8s-at-home.com
     version: 2.4.0
 annotations:
+  artifacthub.io/prerelease: "true"
+  artifacthub.io/changes: |
+    - kind: added
+      description: Readme examples
+      links:
+        - name: Github PR
+          url: https://github.com/goauthentik/helm/pull/3
+    - kind: added
+      description: envValueFrom
+      links:
+        - name: Github PR
+          url: https://github.com/goauthentik/helm/pull/3
   artifacthub.io/license: GPL-3.0-only
   artifacthub.io/links: |
     - name: Github

diff --git a/charts/authentik/templates/deployment.yaml b/charts/authentik/templates/deployment.yaml
@@ -21,7 +21,7 @@ spec:
       {{- end }}
       {{- with $.Values.affinity }}
       affinity:
-      {{- toYaml . | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
         - name: {{ $.Chart.Name }}
@@ -33,16 +33,21 @@ spec:
             - name: {{ quote $k }}
               value: {{ quote $v }}
             {{- end }}
-          {{- include "authentik.env" $.Values.authentik | indent 12 }}
-          {{- with $.Values.envFrom }}
+            {{- include "authentik.env" $.Values.authentik | indent 12 }}
+            {{- range $name, $val := $.Values.envValueFrom }}
+          - name: {{ $name }}
+            valueFrom:
+              {{- toYaml $val | nindent 14 }}
+            {{- end }}
+            {{- with $.Values.envFrom }}
           envFrom:
-          {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with $.Values.volumeMounts }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+            {{- with $.Values.volumeMounts }}
           volumeMounts:
-          {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- if eq . "server" }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+            {{- if eq . "server" }}
           ports:
             - name: http
               containerPort: 9000
@@ -51,24 +56,24 @@ spec:
               containerPort: 9443
               protocol: TCP
               {{- if $.Values.livenessProbe.enabled }}
-          {{- with omit $.Values.livenessProbe "enabled" }}
+                {{- with omit $.Values.livenessProbe "enabled" }}
           livenessProbe:
-          {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- end }}
-          {{- if $.Values.readinessProbe.enabled }}
-          {{- with omit $.Values.readinessProbe "enabled" }}
+                  {{- toYaml . | nindent 12 }}
+                {{- end }}
+              {{- end }}
+              {{- if $.Values.readinessProbe.enabled }}
+                {{- with omit $.Values.readinessProbe "enabled" }}
           readinessProbe:
-          {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- end }}
-          {{- end }}
-          {{- with index $.Values.resources . }}
+                  {{- toYaml . | nindent 12 }}
+                {{- end }}
+              {{- end }}
+            {{- end }}
+            {{- with index $.Values.resources . }}
           resources:
-          {{- toYaml . | nindent 12 }}
-      {{- end }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
       {{- with $.Values.volumes }}
       volumes:
-      {{- toYaml . | nindent 8 }}
-  {{- end }}
-  {{- end }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/authentik/values.yaml b/charts/authentik/values.yaml
@@ -35,7 +35,7 @@ authentik:
     send_pii: ""
   postgresql:
     host: ""
-    database: ""
+    name: ""
     user: ""
     s3_backup:
       access_key: ""
@@ -48,8 +48,17 @@ authentik:
 
 # see configuration options at https://goauthentik.io/docs/installation/docker-compose-config/
 env: {}
+# AUTHENTIK_VAR_NAME: VALUE
 
 envFrom: []
+#  - configMapRef:
+#      name: special-config
+
+envValueFrom: {}
+#  AUTHENTIK_VAR_NAME:
+#    secretKeyRef:
+#      key: password
+#      name: my-secret
 
 service:
   enabled: true