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

chore(postgres): permit umbrella override api group
teamhephy · Jun 25, 2020 · 3f27776 · 3f27776
2 parents 743890c + 533d3a6
commit 3f27776
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/charts/database/templates/_helpers.tmpl b/charts/database/templates/_helpers.tmpl
@@ -0,0 +1,12 @@
+{{/*
+Set apiVersion based on .Capabilities.APIVersions
+*/}}
+{{- 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/database/templates/database-deployment.yaml b/charts/database/templates/database-deployment.yaml
@@ -1,5 +1,5 @@
 {{- if eq .Values.global.database_location "on-cluster" }}
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "APIVersion" . }}
 kind: Deployment
 metadata:
   name: deis-database