charts/vault: Fix API versions for k8s < 1.21 for the vault chart (ba…

…nk-vaults#1422) * Fix API versions for k8s < 1.21 for the vault chart * Bump up vault chart version to v1.14.2 * Updating only the chart version
liyaka · Sep 16, 2021 · 5ba0ab7 · 5ba0ab7
1 parent 1bed6b8
commit 5ba0ab7
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 3 deletions.
diff --git a/charts/vault/Chart.yaml b/charts/vault/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: vault
-version: 1.14.1
+version: 1.14.2
 appVersion: 1.14.1
 description: A Helm chart for Vault, a tool for managing secrets
 home: https://www.vaultproject.io/

diff --git a/charts/vault/templates/_helpers.tpl b/charts/vault/templates/_helpers.tpl
@@ -48,3 +48,45 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Return the target Kubernetes version.
+https://github.com/bitnami/charts/blob/master/bitnami/common/templates/_capabilities.tpl
+*/}}
+{{- define "vault.capabilities.kubeVersion" -}}
+{{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for policy.
+*/}}
+{{- define "vault.capabilities.policy.apiVersion" -}}
+{{- if semverCompare "<1.21-0" (include "vault.capabilities.kubeVersion" .) -}}
+{{- print "policy/v1beta1" -}}
+{{- else -}}
+{{- print "policy/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for ingress.
+*/}}
+{{- define "vault.capabilities.ingress.apiVersion" -}}
+{{- if .Values.ingress -}}
+{{- if .Values.ingress.apiVersion -}}
+{{- .Values.ingress.apiVersion -}}
+{{- else if semverCompare "<1.14-0" (include "vault.capabilities.kubeVersion" .) -}}
+{{- print "extensions/v1beta1" -}}
+{{- else if semverCompare "<1.19-0" (include "vault.capabilities.kubeVersion" .) -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end }}
+{{- else if semverCompare "<1.14-0" (include "vault.capabilities.kubeVersion" .) -}}
+{{- print "extensions/v1beta1" -}}
+{{- else if semverCompare "<1.19-0" (include "vault.capabilities.kubeVersion" .) -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/vault/templates/ingress.yaml b/charts/vault/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $serviceName := include "vault.fullname" . -}}
 {{- $servicePort := .Values.service.port -}}
-apiVersion: networking.k8s.io/v1
+apiVersion: {{ include "vault.capabilities.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ template "vault.fullname" . }}

diff --git a/charts/vault/templates/pdb.yaml b/charts/vault/templates/pdb.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.podDisruptionBudget.enabled }}
-apiVersion: policy/v1
+apiVersion: {{ include "vault.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "vault.fullname" . }}

diff --git a/charts/vault/values.yaml b/charts/vault/values.yaml
@@ -309,3 +309,6 @@ podDisruptionBudget:
 
 ## Assign a PriorityClassName to pods if set
 priorityClassName: ""
+
+# Override cluster version
+kubeVersion: ""