feat: Argo CD allow custom paths for ingress (#424)
Similar to #317, this allows us to add extra paths to Argo CD. This adds compatibility with the ALB Ingress Controller when using EKS to be able to add the additional listener rule to perform a HTTP->HTTPS redirect on port 80.pull/361/head
parent
bfb16d911b
commit
e1e2dd9631
|
@ -2,7 +2,7 @@ apiVersion: v1
|
|||
appVersion: "1.6.2"
|
||||
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 2.6.1
|
||||
version: 2.6.2
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
keywords:
|
||||
|
|
|
@ -33,6 +33,7 @@ spec:
|
|||
- host: {{ $host }}
|
||||
http:
|
||||
paths:
|
||||
{{- toYaml .Values.server.ingressGrpc.extraPaths | nindent 10 }}
|
||||
{{- range $p := $paths }}
|
||||
- path: {{ $p }}
|
||||
backend:
|
||||
|
@ -43,6 +44,7 @@ spec:
|
|||
{{- else }}
|
||||
- http:
|
||||
paths:
|
||||
{{- toYaml .Values.server.ingressGrpc.extraPaths | nindent 10 }}
|
||||
{{- range $p := $paths }}
|
||||
- path: {{ $p }}
|
||||
backend:
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
{{- $serviceName := include "argo-cd.server.fullname" . -}}
|
||||
{{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingress.https -}}
|
||||
{{- $paths := .Values.server.ingress.paths -}}
|
||||
{{- $extraPaths := .Values.server.ingress.extraPaths -}}
|
||||
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
|
||||
apiVersion: networking.k8s.io/v1beta1
|
||||
{{ else }}
|
||||
|
@ -33,6 +34,7 @@ spec:
|
|||
- host: {{ $host }}
|
||||
http:
|
||||
paths:
|
||||
{{- toYaml $extraPaths | nindent 10 }}
|
||||
{{- range $p := $paths }}
|
||||
- path: {{ $p }}
|
||||
backend:
|
||||
|
@ -43,6 +45,7 @@ spec:
|
|||
{{- else }}
|
||||
- http:
|
||||
paths:
|
||||
{{- toYaml $extraPaths | nindent 10 }}
|
||||
{{- range $p := $paths }}
|
||||
- path: {{ $p }}
|
||||
backend:
|
||||
|
|
|
@ -454,6 +454,12 @@ server:
|
|||
# - argocd.example.com
|
||||
paths:
|
||||
- /
|
||||
extraPaths:
|
||||
[]
|
||||
# - path: /*
|
||||
# backend:
|
||||
# serviceName: ssl-redirect
|
||||
# servicePort: use-annotation
|
||||
tls:
|
||||
[]
|
||||
# - secretName: argocd-example-tls
|
||||
|
@ -476,6 +482,12 @@ server:
|
|||
# - argocd.example.com
|
||||
paths:
|
||||
- /
|
||||
extraPaths:
|
||||
[]
|
||||
# - path: /*
|
||||
# backend:
|
||||
# serviceName: ssl-redirect
|
||||
# servicePort: use-annotation
|
||||
tls:
|
||||
[]
|
||||
# - secretName: argocd-example-tls
|
||||
|
|
Loading…
Reference in New Issue