Use Capabilities as new versions of OpenShift provide batch/v1 (#252)

elixir-cloud-aai · Jan 18, 2024 · 1d3cebd · 1d3cebd
1 parent b4958f8
commit 1d3cebd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/deployment/templates/wes/celery-tmp-cleaner.yaml b/deployment/templates/wes/celery-tmp-cleaner.yaml
@@ -1,8 +1,8 @@
 {{ if .Values.celeryWorker.tmpCleaner }}
-{{ if ne .Values.clusterType "kubernetes" }}
-apiVersion: batch/v1beta1
-{{ else }}
+{{ if .Capabilities.APIVersions.Has "batch/v1" }}
 apiVersion: batch/v1
+{{ else }}
+apiVersion: batch/v1beta1
 {{ end }}
 kind: CronJob
 metadata:

diff --git a/deployment/templates/wes/wes-ingress.yaml b/deployment/templates/wes/wes-ingress.yaml
@@ -58,10 +58,10 @@ status:
   loadBalancer: {}
 
 ---
-{{ if ne .Values.clusterType "kubernetes" }}
-apiVersion: batch/v1beta1
-{{ else }}
+{{ if .Capabilities.APIVersions.Has "batch/v1" }}
 apiVersion: batch/v1
+{{ else }}
+apiVersion: batch/v1beta1
 {{ end }}
 kind: CronJob
 metadata: