From 7693fe1b29192513dc34bf2e16cf22014e02ff02 Mon Sep 17 00:00:00 2001 From: Adam Graves Date: Sat, 2 Nov 2019 01:35:41 +0000 Subject: [PATCH] [prometheus-cloudwatch-exporter] Upgrade api versions (#17764) Signed-off-by: Adam Graves --- .../CHANGELOG.md | 4 +++ .../prometheus-cloudwatch-exporter/Chart.yaml | 2 +- .../templates/_helpers.tpl | 33 +++++++++++++++++++ .../templates/clusterrole.yaml | 2 +- .../templates/clusterrolebinding.yaml | 2 +- .../templates/deployment.yaml | 2 +- .../templates/ingress.yaml | 2 +- 7 files changed, 42 insertions(+), 5 deletions(-) diff --git a/stable/prometheus-cloudwatch-exporter/CHANGELOG.md b/stable/prometheus-cloudwatch-exporter/CHANGELOG.md index 03e5e0cc03..c31f87f959 100644 --- a/stable/prometheus-cloudwatch-exporter/CHANGELOG.md +++ b/stable/prometheus-cloudwatch-exporter/CHANGELOG.md @@ -7,6 +7,10 @@ numbering uses [semantic versioning](http://semver.org). NOTE: The change log until version 0.4.10 is auto generated based on git commits. Those include a reference to the git commit to be able to get more details. +## 0.5.0 + +Update Ingress and Deployment apiVersions for k8s 1.16 support + ## 0.4.12 Updated cloudwatch-exporter version to [0.6.0](https://github.com/prometheus/cloudwatch_exporter/releases/tag/cloudwatch_exporter-0.6.0) diff --git a/stable/prometheus-cloudwatch-exporter/Chart.yaml b/stable/prometheus-cloudwatch-exporter/Chart.yaml index 1ec0d0f227..7940312c1e 100644 --- a/stable/prometheus-cloudwatch-exporter/Chart.yaml +++ b/stable/prometheus-cloudwatch-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.6.0" description: A Helm chart for prometheus cloudwatch-exporter name: prometheus-cloudwatch-exporter -version: 0.4.13 +version: 0.5.0 home: https://github.com/prometheus/cloudwatch_exporter sources: - https://github.com/prometheus/cloudwatch_exporter diff --git a/stable/prometheus-cloudwatch-exporter/templates/_helpers.tpl b/stable/prometheus-cloudwatch-exporter/templates/_helpers.tpl index d3e9b700fb..64758118fb 100644 --- a/stable/prometheus-cloudwatch-exporter/templates/_helpers.tpl +++ b/stable/prometheus-cloudwatch-exporter/templates/_helpers.tpl @@ -30,3 +30,36 @@ Create chart name and version as used by the chart label. {{- define "prometheus-cloudwatch-exporter.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{/* +Return the appropriate apiVersion for deployment. +*/}} +{{- define "deployment.apiVersion" -}} +{{- if semverCompare "<1.9-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "apps/v1beta2" -}} +{{- else -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for rbac. +*/}} +{{- define "rbac.apiVersion" -}} +{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }} +{{- print "rbac.authorization.k8s.io/v1" -}} +{{- else -}} +{{- print "rbac.authorization.k8s.io/v1beta1" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for ingress. +*/}} +{{- define "ingress.apiVersion" -}} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} +{{- print "networking.k8s.io/v1beta1" -}} +{{- else -}} +{{- print "extensions/v1beta1" -}} +{{- end -}} +{{- end -}} diff --git a/stable/prometheus-cloudwatch-exporter/templates/clusterrole.yaml b/stable/prometheus-cloudwatch-exporter/templates/clusterrole.yaml index f058891d69..21c6325a61 100644 --- a/stable/prometheus-cloudwatch-exporter/templates/clusterrole.yaml +++ b/stable/prometheus-cloudwatch-exporter/templates/clusterrole.yaml @@ -1,5 +1,5 @@ {{- if .Values.rbac.create }} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: {{ template "rbac.apiVersion" . }} kind: ClusterRole metadata: name: {{ template "prometheus-cloudwatch-exporter.fullname" . }} diff --git a/stable/prometheus-cloudwatch-exporter/templates/clusterrolebinding.yaml b/stable/prometheus-cloudwatch-exporter/templates/clusterrolebinding.yaml index 6daa0b13f9..6582a22e8b 100644 --- a/stable/prometheus-cloudwatch-exporter/templates/clusterrolebinding.yaml +++ b/stable/prometheus-cloudwatch-exporter/templates/clusterrolebinding.yaml @@ -1,5 +1,5 @@ {{ if .Values.rbac.create }} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: {{ template "rbac.apiVersion" . }} kind: ClusterRoleBinding metadata: name: {{ template "prometheus-cloudwatch-exporter.fullname" . }} diff --git a/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml b/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml index 780d2d73f5..9aab86196a 100644 --- a/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml +++ b/stable/prometheus-cloudwatch-exporter/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: {{ template "deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "prometheus-cloudwatch-exporter.fullname" . }} diff --git a/stable/prometheus-cloudwatch-exporter/templates/ingress.yaml b/stable/prometheus-cloudwatch-exporter/templates/ingress.yaml index dd1a312f3e..ccfa3a6b2c 100644 --- a/stable/prometheus-cloudwatch-exporter/templates/ingress.yaml +++ b/stable/prometheus-cloudwatch-exporter/templates/ingress.yaml @@ -2,7 +2,7 @@ {{- $fullName := include "prometheus-cloudwatch-exporter.fullname" . -}} {{- $servicePort := .Values.service.port -}} {{- $ingressPath := .Values.ingress.path -}} -apiVersion: extensions/v1beta1 +apiVersion: {{ template "ingress.apiVersion" . }} kind: Ingress metadata: name: {{ $fullName }}