From 8c9ac9f5df6a5d832667dc940e7e367377019b98 Mon Sep 17 00:00:00 2001
From: Hemanth Nakkina <nh863p@att.com>
Date: Tue, 6 Mar 2018 08:43:54 +0530
Subject: [PATCH] Remove Api version constraint for CronJob

Cronjob resource is deprecated in batch/v2alpha1 from
k8s 1.8 and batch/v1beta1 is enabled by default. All the
CronJobs are already using batch/v1beta1 but there is condition
to check if api version have batch/v2alpha1.

Remove the api version constraint on batch/v2alpha1

Partial-Bug: #1753524
Change-Id: I7eeb7d6cc2630311ec5d613b9e059824daae0620
---
 cinder/templates/cron-job-cinder-volume-usage-audit.yaml | 2 --
 heat/templates/cron-job-engine-cleaner.yaml              | 2 --
 keystone/templates/cron-job-credential-rotate.yaml       | 2 --
 keystone/templates/cron-job-fernet-rotate.yaml           | 2 +-
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
index 152d609a4d..61e932b31f 100644
--- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
+++ b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
@@ -15,7 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.cron_volume_usage_audit }}
-{{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }}
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.static.volume_usage_audit }}
 
@@ -79,4 +78,3 @@ spec:
               defaultMode: 0555
     {{ if $mounts_cinder_volume_usage_audit.volumes }}{{ toYaml $mounts_cinder_volume_usage_audit.volumes | indent 10 }}{{ end }}
 {{- end }}
-{{- end }}
diff --git a/heat/templates/cron-job-engine-cleaner.yaml b/heat/templates/cron-job-engine-cleaner.yaml
index 1f0fa227b7..5db6cd0b33 100644
--- a/heat/templates/cron-job-engine-cleaner.yaml
+++ b/heat/templates/cron-job-engine-cleaner.yaml
@@ -15,7 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.cron_job_engine_cleaner }}
-{{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }}
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.static.engine_cleaner }}
 
@@ -79,4 +78,3 @@ spec:
               defaultMode: 0555
 {{ if $mounts_heat_engine_cleaner.volumes }}{{ toYaml $mounts_heat_engine_cleaner.volumes | indent 10 }}{{ end }}
 {{- end }}
-{{- end }}
diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml
index 9316b02e04..31fde89df9 100644
--- a/keystone/templates/cron-job-credential-rotate.yaml
+++ b/keystone/templates/cron-job-credential-rotate.yaml
@@ -15,7 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.cron_credential_rotate }}
-{{- if .Capabilities.APIVersions.Has "batch/v2alpha1"}}
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.static.credential_rotate }}
 
@@ -120,4 +119,3 @@ spec:
               defaultMode: 0555
     {{ if $mounts_keystone_credential_rotate.volumes }}{{ toYaml $mounts_keystone_credential_rotate.volumes | indent 10 }}{{ end }}
 {{- end }}
-{{- end }}
diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml
index 4737662bf7..e369afa16c 100644
--- a/keystone/templates/cron-job-fernet-rotate.yaml
+++ b/keystone/templates/cron-job-fernet-rotate.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.cron_fernet_rotate }}
-{{- if and (eq .Values.conf.keystone.token.provider "fernet") (.Capabilities.APIVersions.Has "batch/v2alpha1") }}
+{{- if eq .Values.conf.keystone.token.provider "fernet" }}
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.static.fernet_rotate }}