define ingress api version in templates

Author: cyril-corbon

helm/azure-resourcemanager-exporter/templates/_helpers.tpl

@@ -42,12 +42,12 @@ Create the name of the service account to use.
 {{- end -}}
 
 {{/*
-Return the appropriate apiVersion for rbac.
+Return the appropriate apiVersion for ingress.
 */}}
-{{- define "rbac.apiVersion" -}}
-{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
-{{- print "rbac.authorization.k8s.io/v1" -}}
+{{- define "ingress.apiVersion" -}}
+{{- if semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion }}
+{{- print "networking.k8s.io/v1beta1" -}}
 {{- else -}}
-{{- print "rbac.authorization.k8s.io/v1beta1" -}}
-{{- end -}}
+{{- print "extensions/v1beta1" -}}
 {{- end -}}
+{{- end -}}

helm/azure-resourcemanager-exporter/templates/ingress.yaml

@@ -1,9 +1,5 @@
 {{- if .Values.ingress.enabled -}}
-{{- if semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
+apiVersion: {{ template "ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ template "azure-resourcemanager-exporter.fullname" . }}

helm/azure-resourcemanager-exporter/values.yaml

@@ -1,6 +1,6 @@
 restartPolicy: Always
 
-extraEnv:
+extraEnv: {}
   #AZURE_LOCATION: ""
 
 strategy: