Merge pull request #3 from JupiterOne/ints-16-cronjob-min-k8s

Resolve issue where min supported cronjob wasn't calculated correctly by helm
JupiterOne · Sep 14, 2021 · 374b5d7 · 374b5d7
2 parents 8b3bf95 + 4599449
commit 374b5d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/charts/graph-kubernetes/Chart.yaml b/charts/graph-kubernetes/Chart.yaml
@@ -3,5 +3,5 @@ name: graph-kubernetes
 description:
   Converts K8s resources into a graph model for ingestion into JupiterOne.
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: '0.3.1'
diff --git a/charts/graph-kubernetes/templates/_helpers.tpl b/charts/graph-kubernetes/templates/_helpers.tpl
@@ -86,9 +86,10 @@ Return the appropriate apiVersion for rbac.
 
 {{/*
 Return the appropriate apiVersion for cronjob.
+We also add an extra check on the minimum k8s version because not all vendors 
 */}}
 {{- define "cronjob.apiVersion" -}}
-{{- if .Capabilities.APIVersions.Has "batch/v1" }}
+{{- if and (.Capabilities.APIVersions.Has "batch/v1") (semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.GitVersion) }}
 {{- print "batch/v1" -}}
 {{- else -}}
 {{- print "batch/v1beta1" -}}