Ingress pathtype if condition update (#2592)

* added deault pathType for ingress in 4.x reference chart ingress.yaml * edited ingress.yaml for 3.11 and 3.12 * edited ingress.yaml for reference charts * deleted extra white spaces * edited ingressInternal section for reference-chart_3-13-0 * edited pathType for ingressInternal * updated if condituon for pathType in ingress.yaml Co-authored-by: Shubham9t9 <[email protected]>
devtron-labs · Nov 8, 2022 · abc8021 · abc8021
1 parent 2fe2d5d
commit abc8021
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-10-0/templates/ingress.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-10-0/templates/ingress.yaml
@@ -46,7 +46,7 @@ spec:
       http:
         paths:
           - path: {{ .Values.ingress.path }}
-            {{- if and .Values.ingress.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
             pathType: {{ $.Values.ingress.pathType | default "ImplementationSpecific" }}
             {{- end }}
             backend:

diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-11-0/templates/ingress.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-11-0/templates/ingress.yaml
@@ -46,7 +46,7 @@ spec:
       http:
         paths:
           - path: {{ .Values.ingress.path }}
-            {{- if and .Values.ingress.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
             pathType: {{ $.Values.ingress.pathType | default "ImplementationSpecific" }}
             {{- end }}
             backend:

diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-12-0/templates/ingress.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-12-0/templates/ingress.yaml
@@ -46,7 +46,7 @@ spec:
       http:
         paths:
           - path: {{ .Values.ingress.path }}
-            {{- if and .Values.ingress.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
             pathType: {{ $.Values.ingress.pathType | default "ImplementationSpecific" }}
             {{- end }}
             backend:

diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-13-0/templates/ingress.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-13-0/templates/ingress.yaml
@@ -46,7 +46,7 @@ spec:
       http:
         paths:
           - path: {{ .Values.ingress.path }}
-            {{- if and .Values.ingress.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
             pathType: {{ $.Values.ingress.pathType | default "ImplementationSpecific" }}
             {{- end }}
             backend:

diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-14-0/templates/ingress.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-14-0/templates/ingress.yaml
@@ -49,7 +49,7 @@ spec:
       http:
         paths:
           - path: {{ .Values.ingress.path }}
-            {{- if and .Values.ingress.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
             pathType: {{ $.Values.ingress.pathType | default "ImplementationSpecific" }}
             {{- end }}
             backend:

diff --git a/scripts/devtron-reference-helm-charts/reference-chart_4-15-0/templates/ingress.yaml b/scripts/devtron-reference-helm-charts/reference-chart_4-15-0/templates/ingress.yaml
@@ -49,7 +49,7 @@ spec:
       http:
         paths:
           - path: {{ .Values.ingress.path }}
-            {{- if and .Values.ingress.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
             pathType: {{ $.Values.ingress.pathType | default "ImplementationSpecific" }}
             {{- end }}
             backend: