From d0b347d29ddf6dcf1bb6c9e4da7f392435a5cefd Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Thu, 18 Apr 2024 17:34:51 +0530 Subject: [PATCH] update semverCompare kube version with proper Major.Minor.Patch-release placeholders --- .../cronjob-chart_1-2-0/templates/Cronjob.yaml | 4 ++-- .../cronjob-chart_1-2-0/templates/job.yaml | 2 +- .../cronjob-chart_1-3-0/templates/cronjob.yaml | 4 ++-- .../cronjob-chart_1-3-0/templates/job.yaml | 2 +- .../cronjob-chart_1-4-0/templates/_job_template_spec.yaml | 2 +- .../cronjob-chart_1-4-0/templates/cronjob.yaml | 4 ++-- .../cronjob-chart_1-5-0/templates/_job_template_spec.yaml | 2 +- .../cronjob-chart_1-5-0/templates/cronjob.yaml | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-2-0/templates/Cronjob.yaml b/scripts/devtron-reference-helm-charts/cronjob-chart_1-2-0/templates/Cronjob.yaml index 2ce5564621..6ae459df27 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-2-0/templates/Cronjob.yaml +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-2-0/templates/Cronjob.yaml @@ -25,7 +25,7 @@ {{- end }} {{ if eq .Values.kind "CronJob" }} -{{ if semverCompare "<1.21" .Capabilities.KubeVersion.GitVersion -}} +{{ if semverCompare "<1.21.0-0" .Capabilities.KubeVersion.Version -}} apiVersion: batch/v1beta1 {{- else }} apiVersion: batch/v1 @@ -42,7 +42,7 @@ spec: schedule: {{ $.Values.cronjobConfigs.schedule | quote }} startingDeadlineSeconds: {{ $.Values.cronjobConfigs.startingDeadlineSeconds }} concurrencyPolicy: {{ $.Values.cronjobConfigs.concurrencyPolicy }} - {{ if semverCompare ">1.20" .Capabilities.KubeVersion.GitVersion -}} + {{ if semverCompare ">1.20.0-0" .Capabilities.KubeVersion.Version -}} suspend: {{ $.Values.cronjobConfigs.suspend }} {{- end }} successfulJobsHistoryLimit: {{ $.Values.cronjobConfigs.successfulJobsHistoryLimit }} diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-2-0/templates/job.yaml b/scripts/devtron-reference-helm-charts/cronjob-chart_1-2-0/templates/job.yaml index 1209ef073e..7848d67bd6 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-2-0/templates/job.yaml +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-2-0/templates/job.yaml @@ -40,7 +40,7 @@ spec: activeDeadlineSeconds: {{ .Values.jobConfigs.activeDeadlineSeconds }} parallelism: {{ .Values.jobConfigs.parallelism }} completions: {{ .Values.jobConfigs.completions }} - {{ if semverCompare ">1.20" .Capabilities.KubeVersion.GitVersion -}} + {{ if semverCompare ">1.20.0-0" .Capabilities.KubeVersion.Version -}} suspend: {{ .Values.jobConfigs.suspend }} {{- end }} ttlSecondsAfterFinished: {{ .Values.jobConfigs.ttlSecondsAfterFinished }} diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/templates/cronjob.yaml b/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/templates/cronjob.yaml index 84e0f31d83..9ef3af5e48 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/templates/cronjob.yaml +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/templates/cronjob.yaml @@ -25,7 +25,7 @@ {{- end }} {{ if eq .Values.kind "CronJob" }} -{{ if semverCompare "<1.21" .Capabilities.KubeVersion.GitVersion -}} +{{ if semverCompare "<1.21.0-0" .Capabilities.KubeVersion.Version -}} apiVersion: batch/v1beta1 {{- else }} apiVersion: batch/v1 @@ -42,7 +42,7 @@ spec: schedule: {{ $.Values.cronjobConfigs.schedule | quote }} startingDeadlineSeconds: {{ $.Values.cronjobConfigs.startingDeadlineSeconds }} concurrencyPolicy: {{ $.Values.cronjobConfigs.concurrencyPolicy }} - {{ if semverCompare ">1.20" .Capabilities.KubeVersion.GitVersion -}} + {{ if semverCompare ">1.20.0-0" .Capabilities.KubeVersion.Version -}} suspend: {{ $.Values.cronjobConfigs.suspend }} {{- end }} successfulJobsHistoryLimit: {{ $.Values.cronjobConfigs.successfulJobsHistoryLimit }} diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/templates/job.yaml b/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/templates/job.yaml index 3dc6512876..d99b0b2ba5 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/templates/job.yaml +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-3-0/templates/job.yaml @@ -40,7 +40,7 @@ spec: activeDeadlineSeconds: {{ .Values.jobConfigs.activeDeadlineSeconds }} parallelism: {{ .Values.jobConfigs.parallelism }} completions: {{ .Values.jobConfigs.completions }} - {{ if semverCompare ">1.20" .Capabilities.KubeVersion.GitVersion -}} + {{ if semverCompare ">1.20.0-0" .Capabilities.KubeVersion.Version -}} suspend: {{ .Values.jobConfigs.suspend }} {{- end }} ttlSecondsAfterFinished: {{ .Values.jobConfigs.ttlSecondsAfterFinished }} diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/templates/_job_template_spec.yaml b/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/templates/_job_template_spec.yaml index 888a36ee6e..b679504860 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/templates/_job_template_spec.yaml +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/templates/_job_template_spec.yaml @@ -3,7 +3,7 @@ backoffLimit: {{ $.Values.jobConfigs.backoffLimit }} activeDeadlineSeconds: {{ $.Values.jobConfigs.activeDeadlineSeconds }} parallelism: {{ $.Values.jobConfigs.parallelism }} completions: {{ $.Values.jobConfigs.completions }} -{{- if semverCompare ">1.20" .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">1.20.0-0" .Capabilities.KubeVersion.Version }} suspend: {{ $.Values.jobConfigs.suspend }} {{- end }} ttlSecondsAfterFinished: {{ $.Values.jobConfigs.ttlSecondsAfterFinished }} diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/templates/cronjob.yaml b/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/templates/cronjob.yaml index 5f87f0ecf9..9b0744b03e 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/templates/cronjob.yaml +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-4-0/templates/cronjob.yaml @@ -1,5 +1,5 @@ {{- if eq .Values.kind "CronJob" }} -{{- if semverCompare "<1.21" .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare "<1.21.0-0" .Capabilities.KubeVersion.Version }} apiVersion: batch/v1beta1 {{- else }} apiVersion: batch/v1 @@ -16,7 +16,7 @@ spec: schedule: {{ $.Values.cronjobConfigs.schedule | quote }} startingDeadlineSeconds: {{ $.Values.cronjobConfigs.startingDeadlineSeconds }} concurrencyPolicy: {{ $.Values.cronjobConfigs.concurrencyPolicy }} - {{- if semverCompare ">1.20" .Capabilities.KubeVersion.GitVersion }} + {{- if semverCompare ">1.20.0-0" .Capabilities.KubeVersion.Version }} suspend: {{ $.Values.cronjobConfigs.suspend }} {{- end }} successfulJobsHistoryLimit: {{ $.Values.cronjobConfigs.successfulJobsHistoryLimit }} diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/templates/_job_template_spec.yaml b/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/templates/_job_template_spec.yaml index 0ff1ddc64f..ba8a9987a9 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/templates/_job_template_spec.yaml +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/templates/_job_template_spec.yaml @@ -12,7 +12,7 @@ parallelism: {{ $.Values.jobConfigs.parallelism }} {{- if $.Values.jobConfigs.completions }} completions: {{ $.Values.jobConfigs.completions }} {{- end }} -{{- if semverCompare ">1.20" .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">1.20.0-0" .Capabilities.KubeVersion.Version }} {{- if $.Values.jobConfigs.suspend }} suspend: {{ $.Values.jobConfigs.suspend }} {{- end }} diff --git a/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/templates/cronjob.yaml b/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/templates/cronjob.yaml index aebc009bdd..a5540bbfa4 100644 --- a/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/templates/cronjob.yaml +++ b/scripts/devtron-reference-helm-charts/cronjob-chart_1-5-0/templates/cronjob.yaml @@ -1,5 +1,5 @@ {{- if eq .Values.kind "CronJob" }} -{{- if semverCompare "<1.21" .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare "<1.21.0-0" .Capabilities.KubeVersion.Version }} apiVersion: batch/v1beta1 {{- else }} apiVersion: batch/v1 @@ -23,7 +23,7 @@ spec: {{- if $.Values.cronjobConfigs.concurrencyPolicy }} concurrencyPolicy: {{ $.Values.cronjobConfigs.concurrencyPolicy }} {{- end }} - {{- if semverCompare ">1.20" .Capabilities.KubeVersion.GitVersion }} + {{- if semverCompare ">1.20.0-0" .Capabilities.KubeVersion.Version }} {{- if $.Values.cronjobConfigs.suspend }} suspend: {{ $.Values.cronjobConfigs.suspend }} {{- end }}