diff --git a/bitnami/kube-prometheus/Chart.yaml b/bitnami/kube-prometheus/Chart.yaml index a834a02bb..df7970df6 100644 --- a/bitnami/kube-prometheus/Chart.yaml +++ b/bitnami/kube-prometheus/Chart.yaml @@ -34,4 +34,4 @@ sources: - https://github.com/bitnami/bitnami-docker-prometheus - https://github.com/bitnami/bitnami-docker-alertmanager - https://github.com/prometheus-operator/kube-prometheus -version: 6.3.4 +version: 6.4.0 diff --git a/bitnami/kube-prometheus/README.md b/bitnami/kube-prometheus/README.md index 19ab05d98..d2992daf6 100644 --- a/bitnami/kube-prometheus/README.md +++ b/bitnami/kube-prometheus/README.md @@ -205,6 +205,7 @@ The command removes all the Kubernetes components associated with the chart and | `prometheus.ingress.hostname` | Default host for the ingress resource | `prometheus.local` | | `prometheus.ingress.path` | The Path to Prometheus. You may need to set this to '/*' in order to use this with ALB ingress controllers | `/` | | `prometheus.ingress.annotations` | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}` | +| `prometheus.ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | `""` | | `prometheus.ingress.tls` | Enable TLS configuration for the hostname defined at prometheus.ingress.hostname parameter | `false` | | `prometheus.ingress.extraHosts` | The list of additional hostnames to be covered with this ingress record. | `[]` | | `prometheus.ingress.extraPaths` | Additional arbitrary path/backend objects | `[]` | @@ -331,6 +332,7 @@ The command removes all the Kubernetes components associated with the chart and | `prometheus.thanos.service.extraPorts` | Additional ports to expose from the Thanos sidecar container | `[]` | | `prometheus.thanos.ingress.enabled` | Enable ingress controller resource | `false` | | `prometheus.thanos.ingress.annotations` | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}` | +| `prometheus.thanos.ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | `""` | | `prometheus.thanos.ingress.hosts` | The list of hostnames to be covered with this ingress record. | `[]` | | `prometheus.thanos.ingress.tls` | The tls configuration for the ingress | `{}` | | `prometheus.portName` | Port name used for the pods and governing service. This defaults to web | `web` | @@ -378,6 +380,7 @@ The command removes all the Kubernetes components associated with the chart and | `alertmanager.ingress.hostname` | Default host for the ingress resource | `alertmanager.local` | | `alertmanager.ingress.path` | The Path to Alert Manager. You may need to set this to '/*' in order to use this with ALB ingress controllers. | `/` | | `alertmanager.ingress.annotations` | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}` | +| `alertmanager.ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | `""` | | `alertmanager.ingress.tls` | Enable TLS configuration for the hostname defined at alertmanager.ingress.hostname parameter | `false` | | `alertmanager.ingress.extraHosts` | The list of additional hostnames to be covered with this ingress record. | `[]` | | `alertmanager.ingress.extraPaths` | Additional arbitrary path/backend objects | `[]` | diff --git a/bitnami/kube-prometheus/templates/alertmanager/ingress.yaml b/bitnami/kube-prometheus/templates/alertmanager/ingress.yaml index d74c1ec32..71c554da7 100644 --- a/bitnami/kube-prometheus/templates/alertmanager/ingress.yaml +++ b/bitnami/kube-prometheus/templates/alertmanager/ingress.yaml @@ -13,6 +13,9 @@ metadata: {{ $key }}: {{ $value | quote }} {{- end }} spec: + {{- if and .Values.alertmanager.ingress.ingressClassName (include "common.ingress.supportsIngressClassname" .) }} + ingressClassName: {{ .Values.alertmanager.ingress.ingressClassName | quote }} + {{- end }} rules: {{- if .Values.alertmanager.ingress.hostname }} - host: {{ .Values.alertmanager.ingress.hostname }} diff --git a/bitnami/kube-prometheus/templates/prometheus/ingress.yaml b/bitnami/kube-prometheus/templates/prometheus/ingress.yaml index c5fdafa01..b843e8c99 100644 --- a/bitnami/kube-prometheus/templates/prometheus/ingress.yaml +++ b/bitnami/kube-prometheus/templates/prometheus/ingress.yaml @@ -13,6 +13,9 @@ metadata: {{ $key }}: {{ $value | quote }} {{- end }} spec: + {{- if and .Values.prometheus.ingress.ingressClassName (include "common.ingress.supportsIngressClassname" .) }} + ingressClassName: {{ .Values.prometheus.ingress.ingressClassName | quote }} + {{- end }} rules: {{- if .Values.prometheus.ingress.hostname }} - host: {{ .Values.prometheus.ingress.hostname }} diff --git a/bitnami/kube-prometheus/templates/prometheus/thanos-ingress.yaml b/bitnami/kube-prometheus/templates/prometheus/thanos-ingress.yaml index 9c05eae11..f1156dcd6 100644 --- a/bitnami/kube-prometheus/templates/prometheus/thanos-ingress.yaml +++ b/bitnami/kube-prometheus/templates/prometheus/thanos-ingress.yaml @@ -14,6 +14,9 @@ metadata: {{ $key }}: {{ $value | quote }} {{- end }} spec: + {{- if and .Values.prometheus.thanos.ingress.ingressClassName (include "common.ingress.supportsIngressClassname" .) }} + ingressClassName: {{ .Values.prometheus.thanos.ingress.ingressClassName | quote }} + {{- end }} rules: {{- range .Values.prometheus.thanos.ingress.hosts }} - host: {{ .name }} diff --git a/bitnami/kube-prometheus/values.yaml b/bitnami/kube-prometheus/values.yaml index 861537782..3d2ee9e03 100644 --- a/bitnami/kube-prometheus/values.yaml +++ b/bitnami/kube-prometheus/values.yaml @@ -508,6 +508,11 @@ prometheus: ## cert-manager.io/cluster-issuer: cluster-issuer-name ## annotations: {} + ## @param prometheus.ingress.ingressClassName IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) + ## This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . + ## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ + ## + ingressClassName: "" ## @param prometheus.ingress.tls Enable TLS configuration for the hostname defined at prometheus.ingress.hostname parameter ## TLS certificates will be retrieved from a TLS secret with name: {{- printf "%s-tls" .Values.prometheus.ingress.hostname }} ## You can use the prometheus.ingress.secrets parameter to create this TLS secret or relay on cert-manager to create it @@ -1080,6 +1085,11 @@ prometheus: ## cert-manager.io/cluster-issuer: cluster-issuer-name ## annotations: {} + ## @param prometheus.thanos.ingress.ingressClassName IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) + ## This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . + ## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ + ## + ingressClassName: "" ## @param prometheus.thanos.ingress.hosts [array] The list of hostnames to be covered with this ingress record. ## Most likely this will be just one host, but in the event more hosts are needed, this is an array ## @@ -1273,6 +1283,11 @@ alertmanager: ## cert-manager.io/cluster-issuer: cluster-issuer-name ## annotations: {} + ## @param alertmanager.ingress.ingressClassName IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) + ## This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . + ## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ + ## + ingressClassName: "" ## @param alertmanager.ingress.tls Enable TLS configuration for the hostname defined at alertmanager.ingress.hostname parameter ## TLS certificates will be retrieved from a TLS secret with name: {{- printf "%s-tls" .Values.alertmanager.ingress.hostname }} ## You can use the alertmanager.ingress.secrets parameter to create this TLS secret or relay on cert-manager to create it