From 97076f8cd588b0ac6db92e0a435a4a0efa051c56 Mon Sep 17 00:00:00 2001
From: Maxime Legault-Venne <mlegoven@hotmail.com>
Date: Wed, 4 Sep 2019 12:55:00 -0400
Subject: [PATCH] Add support to always display login screen (#16806)

The current indentation of the OAuth2 configuration block doesn't allow
for extra properties to be added. This allows to enable the new
configuration that will always display the login screen, even though
only one connector is defined.

The default value (disabled) is also added to the values file for
documentation.

See also: https://github.com/dexidp/dex/releases/tag/v2.18.0
See also: https://github.com/dexidp/dex/pull/1505

Signed-off-by: Maxime Legault-Venne <mlegoven@hotmail.com>
---
 stable/dex/Chart.yaml            | 4 ++--
 stable/dex/README.md             | 1 +
 stable/dex/templates/secret.yaml | 3 +--
 stable/dex/values.yaml           | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/stable/dex/Chart.yaml b/stable/dex/Chart.yaml
index 57bb257c2528..534adb39bc2a 100644
--- a/stable/dex/Chart.yaml
+++ b/stable/dex/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: dex
-version: 2.1.1
-appVersion: 2.17.0
+version: 2.2.0
+appVersion: 2.18.0
 description: CoreOS Dex
 keywords:
 - dex
diff --git a/stable/dex/README.md b/stable/dex/README.md
index 5c177729321b..af794470cf32 100644
--- a/stable/dex/README.md
+++ b/stable/dex/README.md
@@ -73,6 +73,7 @@ Parameters introduced starting from v2
 | `config.grpc.tlsKey` | Maps to the dex config `grpc.tlsKey` param | `/etc/dex/tls/grpc/server/tls.key` |
 | `config.issuer` | Maps to the dex config `issuer` param | `http://dex.io:8080` |
 | `config.logger` | Maps to the dex config `logger` dict param | `{"level": "debug"}` |
+| `config.oauth2.alwaysShowLoginScreen` | Maps to the dex config `oauth2.alwaysShowLoginScreen` param | `false` |
 | `config.oauth2.skipApprovalScreen` | Maps to the dex config `oauth2.skipApprovalScreen` param | `true` |
 | `config.staticClients` | Maps to the dex config `staticClients` list param | `""` |
 | `config.staticPasswords` | Maps to the dex config `staticPasswords` list param | `""` |
diff --git a/stable/dex/templates/secret.yaml b/stable/dex/templates/secret.yaml
index 564bc8995d6f..1d5fe4963243 100644
--- a/stable/dex/templates/secret.yaml
+++ b/stable/dex/templates/secret.yaml
@@ -31,8 +31,7 @@ stringData:
     connectors:
 {{ toYaml .connectors | indent 4 }}
     {{- end }}
-    oauth2:
-    {{ toYaml .oauth2 | indent 2 }}
+    oauth2: {{ toYaml .oauth2 | nindent 6 }}
     {{- if .staticClients }}
     staticClients:
 {{ toYaml .staticClients | indent 4 }}
diff --git a/stable/dex/values.yaml b/stable/dex/values.yaml
index f9cb5259e2cc..6e150d092c1b 100644
--- a/stable/dex/values.yaml
+++ b/stable/dex/values.yaml
@@ -4,7 +4,7 @@
 # name: value
 
 image: quay.io/dexidp/dex
-imageTag: "v2.17.0"
+imageTag: "v2.18.0"
 imagePullPolicy: "IfNotPresent"
 
 inMiniKube: false
@@ -166,6 +166,7 @@ config:
 #      redirectURI: https://dex.minikube.local:5556/callback
 #      org: kubernetes
   oauth2:
+    alwaysShowLoginScreen: false
     skipApprovalScreen: true
 
 #  staticClients: