[stable/prometheus] Use the new api for ingress (#21049)

Signed-off-by: Adrian Berger <adrian.berger@bedag.ch>
This commit is contained in:
Adrian Berger
2020-02-28 05:28:38 -08:00
committed by GitHub
parent 411e85d929
commit 2897f04b79
4 changed files with 13 additions and 1 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: prometheus
version: 10.5.2
version: 10.5.3
appVersion: 2.16.0
description: Prometheus is a monitoring system and time series database.
home: https://prometheus.io/
@@ -3,7 +3,11 @@
{{- $serviceName := include "prometheus.alertmanager.fullname" . }}
{{- $servicePort := .Values.alertmanager.service.servicePort -}}
{{- $extraPaths := .Values.alertmanager.ingress.extraPaths -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
apiVersion: networking.k8s.io/v1beta1
{{ else }}
apiVersion: extensions/v1beta1
{{ end -}}
kind: Ingress
metadata:
{{- if .Values.alertmanager.ingress.annotations }}
@@ -3,7 +3,11 @@
{{- $serviceName := include "prometheus.pushgateway.fullname" . }}
{{- $servicePort := .Values.pushgateway.service.servicePort -}}
{{- $extraPaths := .Values.pushgateway.ingress.extraPaths -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
apiVersion: networking.k8s.io/v1beta1
{{ else }}
apiVersion: extensions/v1beta1
{{ end -}}
kind: Ingress
metadata:
{{- if .Values.pushgateway.ingress.annotations }}
@@ -4,7 +4,11 @@
{{- $serviceName := include "prometheus.server.fullname" . }}
{{- $servicePort := .Values.server.service.servicePort -}}
{{- $extraPaths := .Values.server.ingress.extraPaths -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
apiVersion: networking.k8s.io/v1beta1
{{ else }}
apiVersion: extensions/v1beta1
{{ end -}}
kind: Ingress
metadata:
{{- if .Values.server.ingress.annotations }}