[kube-prometheus-stack] remove support for deprecated ingress version

Signed-off-by: drfaust92 <[email protected]>

Author: DrFaust92

charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml

@@ -34,35 +34,23 @@ spec:
           - path: {{ tpl $p $ }}
             pathType: {{ $pathType }}
             backend:
-              {{- if $apiIsStable }}
               service:
                 name: {{ $backendServiceName }}
                 port:
                   number: {{ $servicePort }}
-              {{- else }}
-              serviceName: {{ $backendServiceName }}
-              servicePort: {{ $servicePort }}
-    {{- end }}
     {{- end -}}
   {{- end -}}
   {{- else }}
     - http:
         paths:
   {{- range $p := $paths }}
           - path: {{ tpl $p $ }}
-            {{- if and $pathType $ingressSupportsPathType }}
             pathType: {{ $pathType }}
-            {{- end }}
             backend:
-              {{- if $apiIsStable }}
               service:
                 name: {{ $backendServiceName }}
                 port:
                   number: {{ $servicePort }}
-              {{- else }}
-              serviceName: {{ $backendServiceName }}
-              servicePort: {{ $servicePort }}
-  {{- end }}
   {{- end -}}
   {{- end -}}
   {{- if .Values.alertmanager.ingress.tls }}

charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml

@@ -41,7 +41,6 @@ items:
                     name: {{ include "kube-prometheus-stack.fullname" $ }}-alertmanager-{{ $i }}
                     port:
                       number: {{ $servicePort }}
-      {{- end }}
       {{- end -}}
       {{- if or $ingressValues.tlsSecretName $ingressValues.tlsSecretPerReplica.enabled }}
       tls:

charts/kube-prometheus-stack/templates/prometheus/ingress.yaml

@@ -37,27 +37,19 @@ spec:
                 name: {{ $serviceName }}
                 port:
                   number: {{ $servicePort }}
-    {{- end }}
     {{- end -}}
   {{- end -}}
   {{- else }}
     - http:
         paths:
   {{- range $p := $paths }}
           - path: {{ tpl $p $ }}
-            {{- if and $pathType $ingressSupportsPathType }}
             pathType: {{ $pathType }}
-            {{- end }}
             backend:
-              {{- if $apiIsStable }}
               service:
                 name: {{ $serviceName }}
                 port:
                   number: {{ $servicePort }}
-              {{- else }}
-              serviceName: {{ $serviceName }}
-              servicePort: {{ $servicePort }}
-  {{- end }}
   {{- end -}}
   {{- end -}}
   {{- if .Values.prometheus.ingress.tls }}

charts/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml

@@ -37,23 +37,19 @@ spec:
                 name: {{ $serviceName }}
                 port:
                   number: {{ $thanosPort }}
-    {{- end }}
     {{- end -}}
   {{- end -}}
   {{- else }}
     - http:
         paths:
   {{- range $p := $paths }}
           - path: {{ tpl $p $ }}
-            {{- if and $pathType $ingressSupportsPathType }}
             pathType: {{ $pathType }}
-            {{- end }}
             backend:
               service:
                 name: {{ $serviceName }}
                 port:
                   number: {{ $thanosPort }}
-  {{- end }}
   {{- end -}}
   {{- end -}}
   {{- if .Values.prometheus.thanosIngress.tls }}

charts/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml

@@ -41,7 +41,6 @@ items:
                     name: {{ include "kube-prometheus-stack.fullname" $ }}-prometheus-{{ $i }}
                     port:
                       number: {{ $servicePort }}
-      {{- end }}
       {{- end -}}
       {{- if or $ingressValues.tlsSecretName $ingressValues.tlsSecretPerReplica.enabled }}
       tls:

charts/kube-prometheus-stack/templates/thanos-ruler/ingress.yaml

@@ -37,7 +37,6 @@ spec:
                 name: {{ $serviceName }}
                 port:
                   number: {{ $servicePort }}
-    {{- end }}
     {{- end -}}
   {{- end -}}
   {{- else }}
@@ -51,7 +50,6 @@ spec:
                 name: {{ $serviceName }}
                 port:
                   number: {{ $servicePort }}
-  {{- end }}
   {{- end -}}
   {{- end -}}
   {{- if .Values.thanosRuler.ingress.tls }}