Merge branch 'master' into feature/dex

charts/argo-cd/README.md

@@ -397,7 +397,9 @@ NAME: my-release
 | dex.serviceAccount.create | Create dex service account | `true` |
 | dex.serviceAccount.name | Dex service account name | `"argocd-dex-server"` |
 | dex.servicePortGrpc | Server GRPC port | `5557` |
+| dex.servicePortGrpcName | Server GRPC port name | `grpc` |
 | 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.volumeMounts | Dex volume mounts | `"/shared"` |
 | dex.volumes | Dex volumes | `{}` |

charts/argo-cd/templates/dex/service.yaml

@@ -16,11 +16,11 @@ metadata:
 {{- end }}
 spec:
   ports:
-  - name: http
+  - name: {{ .Values.dex.servicePortHttpName }}
     protocol: TCP
     port: {{ .Values.dex.servicePortHttp }}
     targetPort: http
-  - name: grpc
+  - name: {{ .Values.dex.servicePortGrpcName }}
     protocol: TCP
     port: {{ .Values.dex.servicePortGrpc }}
     targetPort: grpc

charts/argo-cd/values.yaml

@@ -297,8 +297,10 @@ dex:
   ## Dex deployment container ports
   containerPortHttp: 5556
   servicePortHttp: 5556
+  servicePortHttpName: http
   containerPortGrpc: 5557
   servicePortGrpc: 5557
+  servicePortGrpcName: grpc
   containerPortMetrics: 5558
   servicePortMetrics: 5558