Merge pull request #5 from kingdonb/k8s-1-16-chart-update

Cryptophobia · web-flow · commit 2e015788e5ec · 2020-06-24T17:01:22.000-04:00
chore(workflow-manager): permit umbrella override api group
diff --git a/charts/workflow-manager/templates/_helpers.tmpl b/charts/workflow-manager/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/workflow-manager/templates/workflow-manager-deployment.yaml b/charts/workflow-manager/templates/workflow-manager-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "APIVersion" . }}
 kind: Deployment
 metadata:
   name: deis-workflow-manager

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-apiVersion: extensions/v1beta1`
	`1`	`+apiVersion: {{ template "APIVersion" . }}`
`2`	`2`	`kind: Deployment`
`3`	`3`	`metadata:`
`4`	`4`	`name: deis-workflow-manager`