From 8125f928ea00cef542f0e5b482aedec2c0d46043 Mon Sep 17 00:00:00 2001 From: Thom Date: Tue, 10 Aug 2021 15:45:09 +0200 Subject: [PATCH] feat(argo-workflow): Add pathType value to ingress (#854) Signed-off-by: thomascjohnson --- charts/argo-workflows/Chart.yaml | 4 ++-- charts/argo-workflows/templates/server/server-ingress.yaml | 5 +++-- charts/argo-workflows/values.yaml | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml index 768d2266..df0aea74 100644 --- a/charts/argo-workflows/Chart.yaml +++ b/charts/argo-workflows/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: argo-workflows description: A Helm chart for Argo Workflows type: application -version: 0.2.12 +version: 0.2.13 appVersion: "v3.0.7" icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm @@ -15,4 +15,4 @@ maintainers: - name: benjaminws annotations: artifacthub.io/changes: | - - "[Changed]: Argo workflows values file no longer has examples referencing ArgoCD" + - "[Added]: pathType variable now available for ingress template" diff --git a/charts/argo-workflows/templates/server/server-ingress.yaml b/charts/argo-workflows/templates/server/server-ingress.yaml index 6072c9d7..969676e1 100644 --- a/charts/argo-workflows/templates/server/server-ingress.yaml +++ b/charts/argo-workflows/templates/server/server-ingress.yaml @@ -3,6 +3,7 @@ {{- $servicePort := .Values.server.servicePort -}} {{- $paths := .Values.server.ingress.paths -}} {{- $extraPaths := .Values.server.ingress.extraPaths -}} +{{- $pathType := .Values.server.ingress.pathType -}} apiVersion: {{ include "argo-workflows.ingress.apiVersion" . }} kind: Ingress metadata: @@ -36,7 +37,7 @@ spec: {{- range $p := $paths }} - path: {{ $p }} {{- if eq (include "argo-workflows.ingress.apiVersion" $) "networking.k8s.io/v1" }} - pathType: Prefix + pathType: {{ $pathType }} {{- end }} backend: {{- if eq (include "argo-workflows.ingress.apiVersion" $) "networking.k8s.io/v1" }} @@ -63,7 +64,7 @@ spec: {{- range $p := $paths }} - path: {{ $p }} {{- if eq (include "argo-workflows.ingress.apiVersion" $) "networking.k8s.io/v1" }} - pathType: Prefix + pathType: {{ $pathType }} {{- end }} backend: {{- if eq (include "argo-workflows.ingress.apiVersion" $) "networking.k8s.io/v1" }} diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml index 50085773..76ed9479 100644 --- a/charts/argo-workflows/values.yaml +++ b/charts/argo-workflows/values.yaml @@ -281,6 +281,7 @@ server: # - argoworkflows.example.com paths: - / + pathType: Prefix extraPaths: [] # - path: /*