diff --git a/bitnami/common/Chart.yaml b/bitnami/common/Chart.yaml index 33e6a65e58..ca4641c2ee 100644 --- a/bitnami/common/Chart.yaml +++ b/bitnami/common/Chart.yaml @@ -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 diff --git a/bitnami/common/templates/_capabilities.tpl b/bitnami/common/templates/_capabilities.tpl index 3c54bc4fb7..0fd7cbd952 100644 --- a/bitnami/common/templates/_capabilities.tpl +++ b/bitnami/common/templates/_capabilities.tpl @@ -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" -}} diff --git a/githooks/functions/libhelmlint.sh b/githooks/functions/libhelmlint.sh index 661b446acf..82737ab192 100644 --- a/githooks/functions/libhelmlint.sh +++ b/githooks/functions/libhelmlint.sh @@ -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/}