Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-08-10 14:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/common] fix: moving kube version comparison (#4804)

Browse Source 
Signed-off-by: darteaga <darteaga@vmware.com>
This commit is contained in:
Daniel Arteaga
2020-12-23 18:19:16 +01:00
committed by GitHub
parent dd20da4d4a
commit cdb6ae8f00
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/common/Chart.yaml
+2 -2
View File
@@ -2,7 +2,7 @@ annotations:
category: Infrastructure
apiVersion: v2
# Please make sure that version and appVersion are always the same.
appVersion: 1.1.1
appVersion: 1.1.4
description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself.
home: https://github.com/bitnami/charts/tree/master/bitnami/common
icon: https://bitnami.com/downloads/logos/bitnami-mark.png
@@ -20,4 +20,4 @@ sources:
- https://github.com/bitnami/charts
- http://www.bitnami.com/
type: library
version: 1.1.3
version: 1.1.4
bitnami/common/templates/_capabilities.tpl
+4 -4
View File
@@ -3,7 +3,7 @@
Return the appropriate apiVersion for deployment.
*/}}
{{- define "common.capabilities.deployment.apiVersion" -}}
{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.Version -}}
{{- print "extensions/v1beta1" -}}
{{- else -}}
{{- print "apps/v1" -}}
@@ -14,7 +14,7 @@ Return the appropriate apiVersion for deployment.
Return the appropriate apiVersion for statefulset.
*/}}
{{- define "common.capabilities.statefulset.apiVersion" -}}
{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.Version -}}
{{- print "apps/v1beta1" -}}
{{- else -}}
{{- print "apps/v1" -}}
@@ -25,9 +25,9 @@ Return the appropriate apiVersion for statefulset.
Return the appropriate apiVersion for ingress.
*/}}
{{- define "common.capabilities.ingress.apiVersion" -}}
{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.Version -}}
{{- print "extensions/v1beta1" -}}
{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}}
{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.Version -}}
{{- print "networking.k8s.io/v1beta1" -}}
{{- else -}}
{{- print "networking.k8s.io/v1" -}}
githooks/functions/libhelmlint.sh
+1 -1
View File
@@ -19,7 +19,7 @@ run_helm_lint_chart() {
printf '\033\033[0;34m- Running helm template in %s \n\033[0m' "$chart_name"
for values_file in "$chart_path"/values.yaml $(< "$ci_values_file_list"); do
if [[ ! -f "$values_file" ]];then
if [[ ! -f "$values_file" ]] || [[ "$values_file" = */bitnami/common/* ]];then
continue
fi
values_file_display=${values_file#$chart_path/}