diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml index 152d609a..61e932b3 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 1f0fa227..5db6cd0b 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 9316b02e..31fde89d 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 4737662b..e369afa1 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 }}