From 77d989840925c666019adc87471cb54c1ecc1ee0 Mon Sep 17 00:00:00 2001 From: Atchuu Date: Wed, 13 Nov 2019 08:35:47 -0500 Subject: [PATCH 1/3] Adding path as an available option to the ingress. --- jira/templates/ingress.yaml | 6 +++++- jira/values.yaml | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jira/templates/ingress.yaml b/jira/templates/ingress.yaml index edcd970..c301d94 100644 --- a/jira/templates/ingress.yaml +++ b/jira/templates/ingress.yaml @@ -10,8 +10,12 @@ spec: rules: - host: {{ .Values.Ingress.Host }} http: - paths: + paths: + {{- if .Values.Ingress.Path }} + - path: {{ .Values.Ingress.Path }} + {{- else }} - path: / + {{- end }} backend: serviceName: {{ .Release.Name }} servicePort: {{ .Values.Ingress.ServicePort }} diff --git a/jira/values.yaml b/jira/values.yaml index c1dd87c..ef5c422 100644 --- a/jira/values.yaml +++ b/jira/values.yaml @@ -113,6 +113,8 @@ Ingress: Enabled: true Host: jira.example.com ServicePort: 8080 + # Optional: Define a path to use in the ingress + # Path: /jira # to add promethues annotations PrometheusMetrics: From ec3357d78377b1a872cacab9116b870ed5e35642 Mon Sep 17 00:00:00 2001 From: Atchuu Date: Wed, 13 Nov 2019 08:37:47 -0500 Subject: [PATCH 2/3] Adding path as an available option to the ingress. --- confluence/templates/ingress.yaml | 4 ++++ confluence/values.yaml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/confluence/templates/ingress.yaml b/confluence/templates/ingress.yaml index dfbd3df..b09a933 100644 --- a/confluence/templates/ingress.yaml +++ b/confluence/templates/ingress.yaml @@ -17,7 +17,11 @@ spec: - host: {{ .Values.Ingress.Host }} http: paths: + {{- if .Values.Ingress.Path }} + - path: {{ .Values.Ingress.Path }} + {{- else }} - path: / + {{- end }} backend: serviceName: {{ .Release.Name }} servicePort: {{ .Values.Ingress.ServicePort }} diff --git a/confluence/values.yaml b/confluence/values.yaml index 1ac2a74..7a987a8 100644 --- a/confluence/values.yaml +++ b/confluence/values.yaml @@ -96,6 +96,8 @@ Ingress: ServicePort: 8090 # Annotations: # - key: value + # Optional: Define a path to use in the ingress + Path: /confluence PodDisruption: Enabled: false From 1cf9ad1e02ae2239f6ecfaa3c412114d49e73a47 Mon Sep 17 00:00:00 2001 From: Atchuu Date: Wed, 13 Nov 2019 08:45:37 -0500 Subject: [PATCH 3/3] Disabling path by default for Confluence --- confluence/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluence/values.yaml b/confluence/values.yaml index 7a987a8..73f771e 100644 --- a/confluence/values.yaml +++ b/confluence/values.yaml @@ -97,7 +97,7 @@ Ingress: # Annotations: # - key: value # Optional: Define a path to use in the ingress - Path: /confluence + # Path: /confluence PodDisruption: Enabled: false