Merge "Remove Api version constraint for CronJob"

This commit is contained in:
Zuul
2018-03-08 11:48:55 +00:00
committed by Gerrit Code Review
4 changed files with 1 additions and 7 deletions

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}