From e67bea1253093fa01072ef1c64e099fdc9384a37 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 31 Aug 2021 20:49:20 +0200
Subject: [PATCH] small authelia bugfix (+1 squashed commits)

Squashed commits:

[3134d5106] fix statefullset storage on TrueNAS and fix statefullset default for OpenLDAP
---
 charts/incubator/authelia/Chart.yaml             | 2 +-
 charts/incubator/authelia/SCALE/ix_values.yaml   | 2 +-
 charts/library/common/Chart.yaml                 | 2 +-
 charts/library/common/templates/_statefulset.tpl | 3 ++-
 charts/stable/openldap/Chart.yaml                | 2 +-
 charts/stable/openldap/SCALE/questions.yaml      | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/charts/incubator/authelia/Chart.yaml b/charts/incubator/authelia/Chart.yaml
index dca31ac37b3..a359d17aafe 100644
--- a/charts/incubator/authelia/Chart.yaml
+++ b/charts/incubator/authelia/Chart.yaml
@@ -38,4 +38,4 @@ sources:
 - https://github.com/authelia/chartrepo
 - https://github.com/authelia/authelia
 type: application
-version: 1.6.2
+version: 1.6.3
diff --git a/charts/incubator/authelia/SCALE/ix_values.yaml b/charts/incubator/authelia/SCALE/ix_values.yaml
index 32637a28eec..d84b0926487 100644
--- a/charts/incubator/authelia/SCALE/ix_values.yaml
+++ b/charts/incubator/authelia/SCALE/ix_values.yaml
@@ -154,7 +154,7 @@ redisProvider:
     route_randomly: false
 
 identity_providers:
-    oidc:
+  oidc:
     ## Enables this in the config map. Currently in beta stage.
     ## See https://www.authelia.com/docs/configuration/identity-providers/oidc.html#roadmap
     enabled: false
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index fe31c9deb3a..6c77c4da55c 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 6.12.2
+version: 6.12.3
diff --git a/charts/library/common/templates/_statefulset.tpl b/charts/library/common/templates/_statefulset.tpl
index 2d69f68f3ef..588e649de67 100644
--- a/charts/library/common/templates/_statefulset.tpl
+++ b/charts/library/common/templates/_statefulset.tpl
@@ -3,6 +3,7 @@ This template serves as the blueprint for the StatefulSet objects that are creat
 within the common library.
 */}}
 {{- define "common.statefulset" }}
+{{- $releaseName := .Release.Name }}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -62,7 +63,7 @@ spec:
           requests:
             storage: {{ required (printf "size is required for PVC %v" $vct.name) $vct.size | quote }}
         {{- if $vct.storageClass }}
-        storageClassName: {{ if (eq "-" $vct.storageClass) }}""{{- else if (eq "SCALE-ZFS" $vct.storageClass ) }}{{ ( printf "%v-%v"  "ix-storage-class" .Release.Name ) }}{{- else }}{{ $vct.storageClass | quote }}{{- end }}
+        storageClassName: {{ if (eq "-" $vct.storageClass) }}""{{- else if (eq "SCALE-ZFS" $vct.storageClass ) }}{{ ( printf "%v-%v"  "ix-storage-class" $releaseName ) }}{{- else }}{{ $vct.storageClass | quote }}{{- end }}
         {{- end }}
     {{- end }}
 {{- end }}
diff --git a/charts/stable/openldap/Chart.yaml b/charts/stable/openldap/Chart.yaml
index 61553e84d73..52ecda17b56 100644
--- a/charts/stable/openldap/Chart.yaml
+++ b/charts/stable/openldap/Chart.yaml
@@ -26,4 +26,4 @@ sources:
 - https://github.com/jp-gouin/helm-openldap
 - https://github.com/osixia/docker-openldap
 type: application
-version: 1.7.8
+version: 1.7.9
diff --git a/charts/stable/openldap/SCALE/questions.yaml b/charts/stable/openldap/SCALE/questions.yaml
index d4df13bf3d7..5c36af8a03e 100644
--- a/charts/stable/openldap/SCALE/questions.yaml
+++ b/charts/stable/openldap/SCALE/questions.yaml
@@ -46,7 +46,7 @@ questions:
           label: "(Advanced) Controller Type"
           schema:
             type: string
-            default: "Statefulset"
+            default: "statefulset"
             required: true
             enum:
               - value: "deployment"