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

feat(argo-cd): Add templating of ingress extra paths and rules (#2530)

Browse source 
Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
Signed-off-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
Co-authored-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Petr Drastil 2024-02-29 20:45:29 +01:00 committed by GitHub
parent 31de7d3594
commit 74fbd561b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 39 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/argo-cd/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: v2.10.1
kubeVersion: ">=1.23.0-0" kubeVersion: ">=1.23.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 6.4.2 version: 6.5.0
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources: sources:
@ -26,5 +26,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: fixed - kind: added
description: Pass argocd-server's ALB health check description: Support for templating ingress extraPaths and extraRules

4
charts/argo-cd/templates/argocd-applicationset/ingress.yaml
View file

@ -24,7 +24,7 @@ spec:
http: http:
paths: paths:
{{- with .Values.applicationSet.ingress.extraPaths }} {{- with .Values.applicationSet.ingress.extraPaths }}
{{- toYaml . | nindent 10 }} {{- tpl (toYaml .) $ | nindent 10 }}
{{- end }} {{- end }}
- path: {{ .Values.applicationSet.ingress.path }} - path: {{ .Values.applicationSet.ingress.path }}
pathType: {{ .Values.applicationSet.ingress.pathType }} pathType: {{ .Values.applicationSet.ingress.pathType }}
@ -46,7 +46,7 @@ spec:
number: {{ $.Values.applicationSet.service.port }} number: {{ $.Values.applicationSet.service.port }}
{{- end }} {{- end }}
{{- with .Values.applicationSet.ingress.extraRules }} {{- with .Values.applicationSet.ingress.extraRules }}
{{- toYaml . | nindent 4 }} {{- tpl (toYaml .) $ | nindent 4 }}
{{- end }} {{- end }}
{{- if or .Values.applicationSet.ingress.tls .Values.applicationSet.ingress.extraTls }} {{- if or .Values.applicationSet.ingress.tls .Values.applicationSet.ingress.extraTls }}
tls: tls:

4
charts/argo-cd/templates/argocd-server/aws/ingress.yaml
View file

@ -26,7 +26,7 @@ spec:
http: http:
paths: paths:
{{- with .Values.server.ingress.extraPaths }} {{- with .Values.server.ingress.extraPaths }}
{{- toYaml . | nindent 10 }} {{- tpl (toYaml .) $ | nindent 10 }}
{{- end }} {{- end }}
- path: {{ .Values.server.ingress.path }} - path: {{ .Values.server.ingress.path }}
pathType: {{ $.Values.server.ingressGrpc.pathType }} pathType: {{ $.Values.server.ingressGrpc.pathType }}
@ -55,7 +55,7 @@ spec:
number: {{ $servicePort }} number: {{ $servicePort }}
{{- end }} {{- end }}
{{- with .Values.server.ingress.extraRules }} {{- with .Values.server.ingress.extraRules }}
{{- toYaml . | nindent 4 }} {{- tpl (toYaml .) $ | nindent 4 }}
{{- end }} {{- end }}
{{- if or .Values.server.ingress.tls .Values.server.ingress.extraTls }} {{- if or .Values.server.ingress.tls .Values.server.ingress.extraTls }}
tls: tls:

4
charts/argo-cd/templates/argocd-server/gke/ingress.yaml
View file

@ -31,7 +31,7 @@ spec:
http: http:
paths: paths:
{{- with .Values.server.ingress.extraPaths }} {{- with .Values.server.ingress.extraPaths }}
{{- toYaml . | nindent 10 }} {{- tpl (toYaml .) $ | nindent 10 }}
{{- end }} {{- end }}
- path: {{ .Values.server.ingress.path }} - path: {{ .Values.server.ingress.path }}
pathType: {{ .Values.server.ingress.pathType }} pathType: {{ .Values.server.ingress.pathType }}
@ -53,7 +53,7 @@ spec:
number: {{ $servicePort }} number: {{ $servicePort }}
{{- end }} {{- end }}
{{- with .Values.server.ingress.extraRules }} {{- with .Values.server.ingress.extraRules }}
{{- toYaml . | nindent 4 }} {{- tpl (toYaml .) $ | nindent 4 }}
{{- end }} {{- end }}
{{- if or .Values.server.ingress.tls .Values.server.ingress.extraTls }} {{- if or .Values.server.ingress.tls .Values.server.ingress.extraTls }}
tls: tls:

4
charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
View file

@ -25,7 +25,7 @@ spec:
http: http:
paths: paths:
{{- with .Values.server.ingressGrpc.extraPaths }} {{- with .Values.server.ingressGrpc.extraPaths }}
{{- toYaml . | nindent 10 }} {{- tpl (toYaml .) $ | nindent 10 }}
{{- end }} {{- end }}
- path: {{ .Values.server.ingressGrpc.path }} - path: {{ .Values.server.ingressGrpc.path }}
pathType: {{ .Values.server.ingressGrpc.pathType }} pathType: {{ .Values.server.ingressGrpc.pathType }}
@ -47,7 +47,7 @@ spec:
number: {{ $.Values.server.service.servicePortHttps }} number: {{ $.Values.server.service.servicePortHttps }}
{{- end }} {{- end }}
{{- with .Values.server.ingressGrpc.extraRules }} {{- with .Values.server.ingressGrpc.extraRules }}
{{- toYaml . | nindent 4 }} {{- tpl (toYaml .) $ | nindent 4 }}
{{- end }} {{- end }}
{{- if or .Values.server.ingressGrpc.tls .Values.server.ingressGrpc.extraTls }} {{- if or .Values.server.ingressGrpc.tls .Values.server.ingressGrpc.extraTls }}
tls: tls:

4
charts/argo-cd/templates/argocd-server/ingress.yaml
View file

@ -26,7 +26,7 @@ spec:
http: http:
paths: paths:
{{- with .Values.server.ingress.extraPaths }} {{- with .Values.server.ingress.extraPaths }}
{{- toYaml . | nindent 10 }} {{- tpl (toYaml .) $ | nindent 10 }}
{{- end }} {{- end }}
- path: {{ .Values.server.ingress.path }} - path: {{ .Values.server.ingress.path }}
pathType: {{ $.Values.server.ingress.pathType }} pathType: {{ $.Values.server.ingress.pathType }}
@ -48,7 +48,7 @@ spec:
number: {{ $servicePort }} number: {{ $servicePort }}
{{- end }} {{- end }}
{{- with .Values.server.ingress.extraRules }} {{- with .Values.server.ingress.extraRules }}
{{- toYaml . | nindent 4 }} {{- tpl (toYaml .) $ | nindent 4 }}
{{- end }} {{- end }}
{{- if or .Values.server.ingress.tls .Values.server.ingress.extraTls }} {{- if or .Values.server.ingress.tls .Values.server.ingress.extraTls }}
tls: tls:

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

@ -2038,6 +2038,7 @@ server:
# -- Additional ingress paths # -- Additional ingress paths
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
## Note: Supports use of custom Helm templates
extraPaths: [] extraPaths: []
# - path: /* # - path: /*
# pathType: Prefix # pathType: Prefix
@ -2049,15 +2050,17 @@ server:
# -- Additional ingress rules # -- Additional ingress rules
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
## Note: Supports use of custom Helm templates
extraRules: [] extraRules: []
# - host: example.example.com # - http:
# http: # paths:
# path: / # - path: /
# pathType: Prefix
# backend: # backend:
# service: # service:
# name: example-svc # name: '{{ include "argo-cd.server.fullname" . }}'
# port: # port:
# name: http # name: '{{ .Values.server.service.servicePortHttpsName }}'
# -- Additional TLS configuration # -- Additional TLS configuration
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
@ -2144,6 +2147,7 @@ server:
# -- Additional ingress paths for dedicated [gRPC-ingress] # -- Additional ingress paths for dedicated [gRPC-ingress]
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
## Note: Supports use of custom Helm templates
extraPaths: [] extraPaths: []
# - path: /* # - path: /*
# pathType: Prefix # pathType: Prefix
@ -2155,15 +2159,17 @@ server:
# -- Additional ingress rules # -- Additional ingress rules
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
## Note: Supports use of custom Helm templates
extraRules: [] extraRules: []
# - host: example.example.com # - http:
# http: # paths:
# path: / # - path: /
# pathType: Prefix
# backend: # backend:
# service: # service:
# name: example-svc # name: '{{ include "argo-cd.server.fullname" . }}'
# port: # port:
# name: http # name: '{{ .Values.server.service.servicePortHttpName }}'
# -- Additional TLS configuration for dedicated [gRPC-ingress] # -- Additional TLS configuration for dedicated [gRPC-ingress]
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
@ -2904,15 +2910,17 @@ applicationSet:
# -- Additional ingress rules # -- Additional ingress rules
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
## Note: Supports use of custom Helm templates
extraRules: [] extraRules: []
# - host: example.example.com # - http:
# http: # paths:
# path: / # - path: /api/webhook
# backend: # pathType: Prefix
# service: # backend:
# name: example-svc # service:
# port: # name: '{{ include "argo-cd.applicationSet.fullname" . }}'
# name: http # port:
# name: '{{ .Values.applicationSet.service.portName }}'
# -- Additional ingress TLS configuration # -- Additional ingress TLS configuration
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])