[prometheus] add .Capabilities.APIVersions for IngressClass fixes pro…

…metheus-community#507 (prometheus-community#508) * added support for ingressClassName Signed-off-by: Daniel Haas <dhaas@kube1.mekoto.us> * added support for ingressClassName Signed-off-by: Daniel Haas <dhaas@kube1.mekoto.us> * bump chart version Signed-off-by: Daniel Haas <dhaas@kube1.mekoto.us> * fixed incorrect values path Signed-off-by: Daniel Haas <dhaas@kube1.mekoto.us>
strongholder · Dec 21, 2020 · e4d7a0c · e4d7a0c
1 parent c8909b0
commit e4d7a0c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: prometheus
-version: 13.0.0
+version: 13.0.1
 appVersion: 2.22.1
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/

diff --git a/charts/prometheus/templates/alertmanager/ingress.yaml b/charts/prometheus/templates/alertmanager/ingress.yaml
@@ -18,6 +18,11 @@ metadata:
   name: {{ template "prometheus.alertmanager.fullname" . }}
 {{ include "prometheus.namespace" . | indent 2 }}
 spec:
+  {{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/IngressClass") (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/IngressClass") }}
+  {{- if .Values.alertmanager.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.alertmanager.ingress.ingressClassName }}
+  {{- end }}
+  {{- end }}
   rules:
   {{- range .Values.alertmanager.ingress.hosts }}
     {{- $url := splitList "/" . }}

diff --git a/charts/prometheus/templates/server/ingress.yaml b/charts/prometheus/templates/server/ingress.yaml
@@ -19,6 +19,11 @@ metadata:
   name: {{ template "prometheus.server.fullname" . }}
 {{ include "prometheus.namespace" . | indent 2 }}
 spec:
+  {{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/IngressClass") (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/IngressClass") }}
+  {{- if .Values.server.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.server.ingress.ingressClassName }}
+  {{- end }}
+  {{- end }}
   rules:
   {{- range .Values.server.ingress.hosts }}
     {{- $url := splitList "/" . }}