[stable/gangway] fixes issue #15521 (#17361)

* [stable/gangway] fixes issue #15521

Signed-off-by: Brendan Holmes <holmesb@users.noreply.github.com>

* [stable/gangway] #15521 allowing user to specify filename

Signed-off-by: Brendan Holmes <holmesb@users.noreply.github.com>

* [stable/gangway] moving cert into values

Signed-off-by: Brendan Holmes <holmesb@users.noreply.github.com>

* [stable/gangway] lint failing because of missing comment space

Signed-off-by: Brendan Holmes <holmesb@users.noreply.github.com>

* [stable/gangway] removing line-space from configmap

Signed-off-by: Brendan Holmes <holmesb@users.noreply.github.com>
This commit is contained in:
holmesb
2019-09-26 06:13:08 -07:00
committed by Kubernetes Prow Robot
parent 5d79be87ba
commit efe06c712e
4 changed files with 15 additions and 4 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
description: An application that can be used to easily enable authentication flows via OIDC for a kubernetes cluster.
name: gangway
version: 0.1.5
version: 0.1.6
appVersion: 3.0.0
home: https://github.com/heptiolabs/gangway
sources:
+1
View File
@@ -55,6 +55,7 @@ At a minimum you *must* configure any of the values marked as **required** in th
| `gangway.tokenURL` | OAuth2 URL to obtain access tokens. To be taken from the configuration of your OIDC provider. **Required** | `""` |
| `gangway.trustedCAPath` | The path to a root CA to trust for self signed certificates at the Oauth2 URLs | `""` |
| `gangway.usernameClaim` | The JWT claim to use as the username. This is used in UI. Default is "nickname". This is combined with the clusterName for the "user" portion of the kubeconfig. | `name` |
| `trustedCACert` | Specify a CA cert to trust for self signed certificates at the Oauth2 URLs. | `""` |
| `image.repository` | Container image name (Including repository name if not `hub.docker.com`). | `gcr.io/heptio-images/gangway` |
| `image.pullPolicy` | Container pull policy. | `IfNotPresent` |
| `image.tag` | Container image tag. | `v2.2.0` |
+6
View File
@@ -10,5 +10,11 @@ metadata:
data:
gangway.yaml: |
{{- .Values.gangway | toYaml | nindent 4 }}
{{- if .Values.trustedCACert }}
trustedCAPath: /gangway/rootca.crt
rootca.crt: |
{{- .Values.trustedCACert | nindent 4}}
{{ end }}
+7 -3
View File
@@ -12,6 +12,13 @@ image:
nameOverride: ""
fullnameOverride: ""
# Specify a CA cert to trust for self signed certificates at the Oauth2 URLs. Be careful to indent one level beyond the
# trustedCACert key:
# trustedCACert: |-
# -----BEGIN CERTIFICATE-----
# ...
# -----END CERTIFICATE-----
gangway:
# The address to listen on. Defaults to 0.0.0.0 to listen on all interfaces.
# Env var: GANGWAY_HOST
@@ -89,9 +96,6 @@ gangway:
# Env var: GANGWAY_CLUSTER_CA_PATH
# cluster_ca_path: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
# The path to a root CA to trust for self signed certificates at the Oauth2 URLs
# Env var: GANGWAY_TRUSTED_CA_PATH
# trustedCAPath: /cacerts/rootca.crt
# The path gangway uses to create urls (defaults to "")
# Env var: GANGWAY_HTTP_PATH