openstack
/
openstack-helm
Code Issues Proposed changes

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
This commit is contained in:
Hemanth Nakkina 2018-03-06 08:43:54 +05:30
parent a29aa075a4
commit 8c9ac9f5df
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/templates/cron-job-cinder-volume-usage-audit.yaml
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 }}

2
heat/templates/cron-job-engine-cleaner.yaml
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 }}

2
keystone/templates/cron-job-credential-rotate.yaml
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 }}

2
keystone/templates/cron-job-fernet-rotate.yaml
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 }}