From c5828afaf3b81456e423256bacccd86d8a99a2ba Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Tue, 24 Jan 2023 19:51:23 +0100
Subject: [PATCH] feat(build): cherry-pick

---
 .../helmcharts/databases/charts/clickhouse/templates/cron.yaml  | 2 +-
 .../openreplay/charts/utilities/templates/efs-cron.yaml         | 2 +-
 .../openreplay/charts/utilities/templates/report-cron.yaml      | 2 +-
 .../charts/utilities/templates/sessions-cleaner-cron.yaml       | 2 +-
 .../openreplay/charts/utilities/templates/telemetry-cron.yaml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/helmcharts/databases/charts/clickhouse/templates/cron.yaml b/scripts/helmcharts/databases/charts/clickhouse/templates/cron.yaml
index 1ae3d48cb..d0a8b05ca 100644
--- a/scripts/helmcharts/databases/charts/clickhouse/templates/cron.yaml
+++ b/scripts/helmcharts/databases/charts/clickhouse/templates/cron.yaml
@@ -1,5 +1,5 @@
 # https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/
-{{- $kubeTargetVersion := .Capabilities.KubeVersion.Version }}
+{{- $kubeTargetVersion := .Capabilities.KubeVersion.GitVersion }}
 {{- if semverCompare ">=1.22.0-0" $kubeTargetVersion }}
 apiVersion: batch/v1
 {{- else }}
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
index ce423e5e8..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,4 @@
-{{- $kubeTargetVersion := .Capabilities.KubeVersion.Version }}
+{{- $kubeTargetVersion := .Capabilities.KubeVersion.GitVersion }}
 {{- if semverCompare ">=1.22.0-0" $kubeTargetVersion }}
 apiVersion: batch/v1
 {{- else }}
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml
index ea1a8cd4c..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,5 @@
 {{- if .Values.global.enterpriseEditionLicense }}
-{{- $kubeTargetVersion := .Capabilities.KubeVersion.Version }}
+{{- $kubeTargetVersion := .Capabilities.KubeVersion.GitVersion }}
 {{- if semverCompare ">=1.22.0-0" $kubeTargetVersion }}
 apiVersion: batch/v1
 {{- else }}
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 f724151dc..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,5 @@
 {{- if .Values.global.enterpriseEditionLicense }}
-{{- $kubeTargetVersion := .Capabilities.KubeVersion.Version }}
+{{- $kubeTargetVersion := .Capabilities.KubeVersion.GitVersion }}
 {{- if semverCompare ">=1.22.0-0" $kubeTargetVersion }}
 apiVersion: batch/v1
 {{- else }}
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml
index 0121e0ba3..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,5 @@
 {{- if .Values.global.enterpriseEditionLicense }}
-{{- $kubeTargetVersion := .Capabilities.KubeVersion.Version }}
+{{- $kubeTargetVersion := .Capabilities.KubeVersion.GitVersion }}
 {{- if semverCompare ">=1.22.0-0" $kubeTargetVersion }}
 apiVersion: batch/v1
 {{- else }}