home/helm-charts
2
0
Fork 0
mirror of https://github.com/wahyd4/helm-charts.git synced 2026-08-09 04:26:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

[kube-prometheus-stack] add extra support for Amazon EKS and Google GKE KubeVersion on ingress (#1083)

Browse Source 
Signed-off-by: Kirchen99 <latias_latios@126.com>
This commit is contained in:
Kirchen99
2021-06-16 16:55:59 +03:00
committed by GitHub
parent ca6a707599
commit eb9db1a491
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/kube-prometheus-stack/Chart.yaml
+1 -1
View File
@@ -18,7 +18,7 @@ name: kube-prometheus-stack
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
version: 16.8.0
version: 16.9.0
appVersion: 0.48.1
kubeVersion: ">=1.16.0-0"
home: https://github.com/prometheus-operator/kube-prometheus
charts/kube-prometheus-stack/templates/_helpers.tpl
+6 -1
View File
@@ -98,7 +98,12 @@ Allow the release namespace to be overridden for multi-namespace deployments in
{{/* Allow KubeVersion to be overridden. */}}
{{- define "kube-prometheus-stack.ingress.kubeVersion" -}}
{{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride -}}
{{- $kubeVersion := default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride -}}
{{/* Special use case for Amazon EKS, Google GKE */}}
{{- if and (regexMatch "\\d+\\.\\d+\\.\\d+-(?:eks|gke).+" $kubeVersion) (not .Values.kubeVersionOverride) -}}
{{- $kubeVersion = regexFind "\\d+\\.\\d+\\.\\d+" $kubeVersion -}}
{{- end -}}
{{- $kubeVersion -}}
{{- end -}}
{{/* Get Ingress API Version */}}