From 2db89dc4d71fede786238fabc373f865a072325a Mon Sep 17 00:00:00 2001 From: rjshrjndrn Date: Tue, 24 Jan 2023 19:51:23 +0100 Subject: [PATCH] fix(helm): Select cron api based on kube api Signed-off-by: rjshrjndrn --- .../databases/charts/clickhouse/templates/cron.yaml | 5 +++++ .../openreplay/charts/utilities/templates/efs-cron.yaml | 5 +++++ .../openreplay/charts/utilities/templates/report-cron.yaml | 5 +++++ .../charts/utilities/templates/sessions-cleaner-cron.yaml | 5 +++++ .../charts/utilities/templates/telemetry-cron.yaml | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/scripts/helmcharts/databases/charts/clickhouse/templates/cron.yaml b/scripts/helmcharts/databases/charts/clickhouse/templates/cron.yaml index f310068c5..d0a8b05ca 100644 --- a/scripts/helmcharts/databases/charts/clickhouse/templates/cron.yaml +++ b/scripts/helmcharts/databases/charts/clickhouse/templates/cron.yaml @@ -1,5 +1,10 @@ # https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/ +{{- $kubeTargetVersion := .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.22.0-0" $kubeTargetVersion }} apiVersion: batch/v1 +{{- else }} +apiVersion: batch/v1beta1 +{{- end }} kind: CronJob metadata: name: clickhouse-backup diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml index 506eba7e1..31b6caea8 100644 --- a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml +++ b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml @@ -1,4 +1,9 @@ +{{- $kubeTargetVersion := .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.22.0-0" $kubeTargetVersion }} apiVersion: batch/v1 +{{- else }} +apiVersion: batch/v1beta1 +{{- end }} kind: CronJob metadata: name: efs-cleaner diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml index e1d741bb9..b3f258df4 100644 --- a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml +++ b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml @@ -1,5 +1,10 @@ {{- if .Values.global.enterpriseEditionLicense }} +{{- $kubeTargetVersion := .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.22.0-0" $kubeTargetVersion }} apiVersion: batch/v1 +{{- else }} +apiVersion: batch/v1beta1 +{{- end }} kind: CronJob metadata: name: report-cron diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml index b68444832..d724d44cc 100644 --- a/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml +++ b/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml @@ -1,5 +1,10 @@ {{- if .Values.global.enterpriseEditionLicense }} +{{- $kubeTargetVersion := .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.22.0-0" $kubeTargetVersion }} apiVersion: batch/v1 +{{- else }} +apiVersion: batch/v1beta1 +{{- end }} kind: CronJob metadata: name: sessions-cleaner-cron diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml index 715851ce9..2ada4cd10 100644 --- a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml +++ b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml @@ -1,5 +1,10 @@ {{- if .Values.global.enterpriseEditionLicense }} +{{- $kubeTargetVersion := .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.22.0-0" $kubeTargetVersion }} apiVersion: batch/v1 +{{- else }} +apiVersion: batch/v1beta1 +{{- end }} kind: CronJob metadata: name: telemetry-cron