Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

Commit

Permalink
Add support to always display login screen (#16806)
Browse files Browse the repository at this point in the history
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: dexidp/dex#1505

Signed-off-by: Maxime Legault-Venne <[email protected]>
  • Loading branch information
maxlegault authored and k8s-ci-robot committed Sep 4, 2019
1 parent 39822ef commit 97076f8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions stable/dex/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions stable/dex/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `""` |
Expand Down
3 changes: 1 addition & 2 deletions stable/dex/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion stable/dex/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# name: value

image: quay.io/dexidp/dex
imageTag: "v2.17.0"
imageTag: "v2.18.0"
imagePullPolicy: "IfNotPresent"

inMiniKube: false
Expand Down Expand Up @@ -166,6 +166,7 @@ config:
# redirectURI: https://dex.minikube.local:5556/callback
# org: kubernetes
oauth2:
alwaysShowLoginScreen: false
skipApprovalScreen: true

# staticClients:
Expand Down

0 comments on commit 97076f8

Please sign in to comment.