fix(argocd): optional named target port (#479)

This commit is contained in:
Saulius Mašnauskas 2020-10-27 04:27:36 +02:00 committed by GitHub
parent eb88e900b2
commit fbec017cfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

View file

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 1.7.6 appVersion: 1.7.6
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 2.9.4 version: 2.9.5
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords: keywords:

View file

@ -24,11 +24,11 @@ spec:
- name: {{ .Values.server.service.servicePortHttpName }} - name: {{ .Values.server.service.servicePortHttpName }}
protocol: TCP protocol: TCP
port: {{ .Values.server.service.servicePortHttp }} port: {{ .Values.server.service.servicePortHttp }}
targetPort: {{ .Values.server.name }} targetPort: {{- if .Values.server.service.namedTargetPort }} {{ .Values.server.name }} {{- else }} {{ .Values.server.containerPort }} {{- end }}
- name: {{ .Values.server.service.servicePortHttpsName }} - name: {{ .Values.server.service.servicePortHttpsName }}
protocol: TCP protocol: TCP
port: {{ .Values.server.service.servicePortHttps }} port: {{ .Values.server.service.servicePortHttps }}
targetPort: {{ .Values.server.name }} targetPort: {{- if .Values.server.service.namedTargetPort }} {{ .Values.server.name }} {{- else }} {{ .Values.server.containerPort }} {{- end }}
selector: selector:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}

View file

@ -431,6 +431,7 @@ server:
servicePortHttps: 443 servicePortHttps: 443
servicePortHttpName: http servicePortHttpName: http
servicePortHttpsName: https servicePortHttpsName: https
namedTargetPort: true
loadBalancerIP: "" loadBalancerIP: ""
loadBalancerSourceRanges: [] loadBalancerSourceRanges: []