From 80681c6ce6071f4bb6ff14273fbbaee93ffbb5ba Mon Sep 17 00:00:00 2001 From: Abdullah Tariq <2349604+abdullah7@users.noreply.github.com> Date: Tue, 9 Nov 2021 20:01:16 +0100 Subject: [PATCH] [bitnami/elasticsearch] Add support for cronjob apiVersion batch/v1 for Kube v1.21+ (#8075) * Add custom labels option to the service in Kibana chart * Generate README through readme-generator-for-helm * Migrate to batch/v1 api version for curator time based jobs * Update chart's minor version * Add support for batch/v2alpha1 on kube < v1.8 Co-authored-by: Abdullah Tariq --- bitnami/elasticsearch/Chart.yaml | 2 +- bitnami/elasticsearch/templates/_helpers.tpl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bitnami/elasticsearch/Chart.yaml b/bitnami/elasticsearch/Chart.yaml index c464dd8a8b..899bcbb1ae 100644 --- a/bitnami/elasticsearch/Chart.yaml +++ b/bitnami/elasticsearch/Chart.yaml @@ -25,4 +25,4 @@ name: elasticsearch sources: - https://github.com/bitnami/bitnami-docker-elasticsearch - https://www.elastic.co/products/elasticsearch -version: 17.2.0 +version: 17.3.0 diff --git a/bitnami/elasticsearch/templates/_helpers.tpl b/bitnami/elasticsearch/templates/_helpers.tpl index 251b855024..79cdd62124 100644 --- a/bitnami/elasticsearch/templates/_helpers.tpl +++ b/bitnami/elasticsearch/templates/_helpers.tpl @@ -227,8 +227,10 @@ Return the appropriate apiVersion for cronjob APIs. {{- define "cronjob.apiVersion" -}} {{- if semverCompare "< 1.8-0" .Capabilities.KubeVersion.GitVersion -}} {{- print "batch/v2alpha1" }} -{{- else if semverCompare ">=1.8-0" .Capabilities.KubeVersion.GitVersion -}} +{{- else if and (semverCompare ">=1.8-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "< 1.21-0" .Capabilities.KubeVersion.GitVersion) -}} {{- print "batch/v1beta1" }} +{{- else if semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "batch/v1" }} {{- end -}} {{- end -}}