DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add possibility to change NodePort if this is type of Service.

Browse source 
Signed-off-by: Łukasz Żułnowski <lzulnowski@gmail.com>
This commit is contained in:
Łukasz Żułnowski 2020-12-08 20:49:15 +01:00
parent 40e52f62ac
commit 9bda0261e6
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/README.md
View file

@ -251,6 +251,8 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
| server.service.servicePortHttps | Server service https port | `443` | | server.service.servicePortHttps | Server service https port | `443` |
| server.service.servicePortHttpName | Server service http port name, can be used to route traffic via istio | `http` | | server.service.servicePortHttpName | Server service http port name, can be used to route traffic via istio | `http` |
| server.service.servicePortHttpsName | Server service https port name, can be used to route traffic via istio | `https` | | server.service.servicePortHttpsName | Server service https port name, can be used to route traffic via istio | `https` |
| server.service.nodePortHttp | Server service http port for NodePort service type| `30080` |
| server.service.servicePortHttps | Server service http port for NodePort service type | `30443` |
| server.service.loadBalancerSourceRanges | Source IP ranges to allow access to service from. | `[]` | | server.service.loadBalancerSourceRanges | Source IP ranges to allow access to service from. | `[]` |
| server.service.type | Server service type | `"ClusterIP"` | | server.service.type | Server service type | `"ClusterIP"` |
| server.serviceAccount.annotations | Server service account annotations | `{}` | | server.serviceAccount.annotations | Server service account annotations | `{}` |

6
charts/argo-cd/templates/argocd-server/service.yaml
View file

@ -25,10 +25,16 @@ spec:
protocol: TCP protocol: TCP
port: {{ .Values.server.service.servicePortHttp }} port: {{ .Values.server.service.servicePortHttp }}
targetPort: {{- if .Values.server.service.namedTargetPort }} {{ .Values.server.name }} {{- else }} {{ .Values.server.containerPort }} {{- end }} targetPort: {{- if .Values.server.service.namedTargetPort }} {{ .Values.server.name }} {{- else }} {{ .Values.server.containerPort }} {{- end }}
{{- if eq .Values.server.service.type "NodePort" }}
nodePort: {{ .Values.server.service.nodePortHttp }}
{{- 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: {{- if .Values.server.service.namedTargetPort }} {{ .Values.server.name }} {{- else }} {{ .Values.server.containerPort }} {{- end }} targetPort: {{- if .Values.server.service.namedTargetPort }} {{ .Values.server.name }} {{- else }} {{ .Values.server.containerPort }} {{- end }}
{{- if eq .Values.server.service.type "NodePort" }}
nodePort: {{ .Values.server.service.nodePortHttps }}
{{- 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 }}

3
charts/argo-cd/values.yaml
View file

@ -434,6 +434,9 @@ server:
annotations: {} annotations: {}
labels: {} labels: {}
type: ClusterIP type: ClusterIP
## For node port default ports
nodePortHttp: 30080
nodePortHttps: 30443
servicePortHttp: 80 servicePortHttp: 80
servicePortHttps: 443 servicePortHttps: 443
servicePortHttpName: http servicePortHttpName: http