From 8ffb0710188f3003c5dee83c4fc5d2e46f089002 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Sat, 26 Oct 2019 18:18:24 -0400 Subject: [PATCH 1/2] chore(postgres): permit umbrella override api group --- charts/database/templates/database-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/database/templates/database-deployment.yaml b/charts/database/templates/database-deployment.yaml index 0c6a214..0597cc3 100644 --- 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: {{ .Values.global.api_group }} kind: Deployment metadata: name: deis-database From 533d3a6a02b91032932f6b2bcd7b20df600c2a54 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Sat, 2 Nov 2019 11:17:28 -0400 Subject: [PATCH 2/2] chore(charts): define APIVersion template --- charts/database/templates/_helpers.tmpl | 12 ++++++++++++ charts/database/templates/database-deployment.yaml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 charts/database/templates/_helpers.tmpl diff --git a/charts/database/templates/_helpers.tmpl b/charts/database/templates/_helpers.tmpl new file mode 100644 index 0000000..0a6b41c --- /dev/null +++ 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 index 0597cc3..0e5fb9b 100644 --- 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: {{ .Values.global.api_group }} +apiVersion: {{ template "APIVersion" . }} kind: Deployment metadata: name: deis-database