chore(charts): define APIVersion template

Kingdon Barrett · Kingdon Barrett · commit cac151da93cf · 2019-11-02T11:23:32.000-04:00
diff --git a/charts/examples/templates/apache-deployment.yaml b/charts/examples/templates/apache-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: apache
diff --git a/charts/examples/templates/nginx-deployment.yaml b/charts/examples/templates/nginx-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx
diff --git a/charts/router/templates/_helpers.tmpl b/charts/router/templates/_helpers.tmpl
@@ -10,3 +10,12 @@ rbac.authorization.k8s.io/v1alpha1
 rbac.authorization.k8s.io/v1
 {{- end -}}
 {{- end -}}
+{{- define "APIVersion" -}}
+{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
+apps/v1
+{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}}
+extensions/v1beta1
+{{- else -}}
+apps/v1
+{{- end -}}
+{{- end -}}
diff --git a/charts/router/templates/router-deployment.yaml b/charts/router/templates/router-deployment.yaml
@@ -1,5 +1,5 @@
 {{- if not .Values.global.experimental_native_ingress }}
-apiVersion: {{ .Values.global.api_group }}
+apiVersion: {{ template "APIVersion" . }}
 kind: Deployment
 metadata:
   name: deis-router

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-apiVersion: extensions/v1beta1`
	`1`	`+apiVersion: apps/v1`
`2`	`2`	`kind: Deployment`
`3`	`3`	`metadata:`
`4`	`4`	`name: apache`