Merge branch 'master' into feature/dex
This commit is contained in:
commit
b5e00b749d
3 changed files with 6 additions and 2 deletions
|
@ -397,7 +397,9 @@ NAME: my-release
|
||||||
| dex.serviceAccount.create | Create dex service account | `true` |
|
| dex.serviceAccount.create | Create dex service account | `true` |
|
||||||
| dex.serviceAccount.name | Dex service account name | `"argocd-dex-server"` |
|
| dex.serviceAccount.name | Dex service account name | `"argocd-dex-server"` |
|
||||||
| dex.servicePortGrpc | Server GRPC port | `5557` |
|
| dex.servicePortGrpc | Server GRPC port | `5557` |
|
||||||
|
| dex.servicePortGrpcName | Server GRPC port name | `grpc` |
|
||||||
| dex.servicePortHttp | Server HTTP port | `5556` |
|
| dex.servicePortHttp | Server HTTP port | `5556` |
|
||||||
|
| dex.servicePortHttpName | Server GRPC port name | `http` |
|
||||||
| dex.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
|
| dex.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
|
||||||
| dex.volumeMounts | Dex volume mounts | `"/shared"` |
|
| dex.volumeMounts | Dex volume mounts | `"/shared"` |
|
||||||
| dex.volumes | Dex volumes | `{}` |
|
| dex.volumes | Dex volumes | `{}` |
|
||||||
|
|
|
@ -16,11 +16,11 @@ metadata:
|
||||||
{{- end }}
|
{{- end }}
|
||||||
spec:
|
spec:
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: {{ .Values.dex.servicePortHttpName }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
port: {{ .Values.dex.servicePortHttp }}
|
port: {{ .Values.dex.servicePortHttp }}
|
||||||
targetPort: http
|
targetPort: http
|
||||||
- name: grpc
|
- name: {{ .Values.dex.servicePortGrpcName }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
port: {{ .Values.dex.servicePortGrpc }}
|
port: {{ .Values.dex.servicePortGrpc }}
|
||||||
targetPort: grpc
|
targetPort: grpc
|
||||||
|
|
|
@ -297,8 +297,10 @@ dex:
|
||||||
## Dex deployment container ports
|
## Dex deployment container ports
|
||||||
containerPortHttp: 5556
|
containerPortHttp: 5556
|
||||||
servicePortHttp: 5556
|
servicePortHttp: 5556
|
||||||
|
servicePortHttpName: http
|
||||||
containerPortGrpc: 5557
|
containerPortGrpc: 5557
|
||||||
servicePortGrpc: 5557
|
servicePortGrpc: 5557
|
||||||
|
servicePortGrpcName: grpc
|
||||||
containerPortMetrics: 5558
|
containerPortMetrics: 5558
|
||||||
servicePortMetrics: 5558
|
servicePortMetrics: 5558
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue