From 81aef1ecea3957de5128f45db6e70b87a74d278f Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Mon, 12 Jun 2017 00:22:30 -0500 Subject: [PATCH] Configmaps: set default mode of files in *-bin configmaps to +x This PS sets the default modetype of mounts from *-bin configmaps to 0555, and removes the then unnecessary commands from the manifests. Change-Id: I93ce0facb06affdf362a58f8520e69ba94ea3034 --- barbican/templates/deployment-api.yaml | 3 +-- barbican/templates/job-db-init.yaml | 2 +- barbican/templates/job-db-sync.yaml | 2 +- barbican/templates/job-ks-endpoints.yaml | 2 +- barbican/templates/job-ks-service.yaml | 2 +- barbican/templates/job-ks-user.yaml | 2 +- cinder/templates/deployment-api.yaml | 3 +-- cinder/templates/deployment-scheduler.yaml | 2 +- cinder/templates/deployment-volume.yaml | 2 +- cinder/templates/job-db-init.yaml | 2 +- cinder/templates/job-db-sync.yaml | 2 +- cinder/templates/job-ks-endpoints.yaml | 2 +- cinder/templates/job-ks-service.yaml | 2 +- cinder/templates/job-ks-user.yaml | 2 +- cinder/templates/job_bootstrap.yaml | 2 +- glance/templates/deployment-api.yaml | 3 +-- glance/templates/deployment-registry.yaml | 3 +-- glance/templates/job-bootstrap.yaml | 2 +- glance/templates/job-db-init.yaml | 2 +- glance/templates/job-db-sync.yaml | 2 +- glance/templates/job-ks-endpoints.yaml | 2 +- glance/templates/job-ks-service.yaml | 2 +- glance/templates/job-ks-user.yaml | 2 +- heat/templates/deployment-api.yaml | 3 +-- heat/templates/deployment-cfn.yaml | 3 +-- heat/templates/deployment-cloudwatch.yaml | 3 +-- heat/templates/job-db-init.yaml | 2 +- heat/templates/job-db-sync.yaml | 2 +- heat/templates/job-ks-endpoints.yaml | 2 +- heat/templates/job-ks-service.yaml | 2 +- heat/templates/job-ks-user.yaml | 2 +- heat/templates/statefulset-engine.yaml | 2 +- horizon/templates/deployment.yaml | 3 +-- keystone/templates/deployment.yaml | 3 +-- keystone/templates/job-db-init.yaml | 2 +- keystone/templates/job-db-sync.yaml | 2 +- magnum/templates/deployment-api.yaml | 3 +-- magnum/templates/job-db-init.yaml | 2 +- magnum/templates/job-db-sync.yaml | 2 +- magnum/templates/job-ks-endpoints.yaml | 2 +- magnum/templates/job-ks-service.yaml | 2 +- magnum/templates/job-ks-user.yaml | 2 +- magnum/templates/statefulset-conductor.yaml | 2 +- mariadb/templates/statefulset.yaml | 3 +-- mistral/templates/deployment-api.yaml | 3 +-- mistral/templates/deployment-executor.yaml | 2 +- mistral/templates/job-db-init.yaml | 2 +- mistral/templates/job-db-sync.yaml | 2 +- mistral/templates/job-ks-endpoints.yaml | 2 +- mistral/templates/job-ks-service.yaml | 2 +- mistral/templates/job-ks-user.yaml | 2 +- mistral/templates/statefulset-engine.yaml | 2 +- mistral/templates/statefulset-event-engine.yaml | 2 +- neutron/templates/daemonset-dhcp-agent.yaml | 2 +- neutron/templates/daemonset-l3-agent.yaml | 2 +- neutron/templates/daemonset-metadata-agent.yaml | 2 +- neutron/templates/daemonset-ovs-agent.yaml | 2 +- neutron/templates/daemonset-ovs-db.yaml | 2 +- neutron/templates/daemonset-ovs-vswitchd.yaml | 2 +- neutron/templates/deployment-server.yaml | 3 +-- neutron/templates/job-db-init.yaml | 2 +- neutron/templates/job-db-sync.yaml | 2 +- neutron/templates/job-ks-endpoints.yaml | 2 +- neutron/templates/job-ks-service.yaml | 2 +- neutron/templates/job-ks-user.yaml | 2 +- nova/templates/daemonset-compute.yaml | 2 +- nova/templates/daemonset-libvirt.yaml | 3 +-- nova/templates/deployment-api-metadata.yaml | 3 +-- nova/templates/deployment-api-osapi.yaml | 3 +-- nova/templates/deployment-conductor.yaml | 2 +- nova/templates/deployment-consoleauth.yaml | 2 +- nova/templates/deployment-scheduler.yaml | 2 +- nova/templates/job-bootstrap.yaml | 2 +- nova/templates/job-db-init.yaml | 3 +-- nova/templates/job-db-sync.yaml | 2 +- nova/templates/job-ks-endpoints.yaml | 2 +- nova/templates/job-ks-service.yaml | 2 +- nova/templates/job-ks-user.yaml | 2 +- senlin/templates/deployment-api.yaml | 3 +-- senlin/templates/job-db-init.yaml | 2 +- senlin/templates/job-db-sync.yaml | 2 +- senlin/templates/job-ks-endpoints.yaml | 2 +- senlin/templates/job-ks-service.yaml | 2 +- senlin/templates/job-ks-user.yaml | 2 +- senlin/templates/statefulset-engine.yaml | 2 +- 85 files changed, 85 insertions(+), 103 deletions(-) diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml index a1141e180c..6f53719e4c 100644 --- a/barbican/templates/deployment-api.yaml +++ b/barbican/templates/deployment-api.yaml @@ -54,14 +54,12 @@ spec: memory: {{ .Values.resources.api.requests.memory | quote }} {{- end }} command: - - bash - /tmp/barbican.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/barbican.sh - stop ports: @@ -106,4 +104,5 @@ spec: - name: barbican-bin configMap: name: barbican-bin + defaultMode: 0555 {{ if $mounts_barbican_api.volumes }}{{ toYaml $mounts_barbican_api.volumes | indent 8 }}{{ end }} diff --git a/barbican/templates/job-db-init.yaml b/barbican/templates/job-db-init.yaml index 3ccf077d54..dd0f2667d4 100644 --- a/barbican/templates/job-db-init.yaml +++ b/barbican/templates/job-db-init.yaml @@ -50,7 +50,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: sql_connection command: - - python - /tmp/db-init.py volumeMounts: - name: barbican-bin @@ -72,3 +71,4 @@ spec: - name: barbican-bin configMap: name: barbican-bin + defaultMode: 0555 diff --git a/barbican/templates/job-db-sync.yaml b/barbican/templates/job-db-sync.yaml index 11a0076698..aab76b5d99 100644 --- a/barbican/templates/job-db-sync.yaml +++ b/barbican/templates/job-db-sync.yaml @@ -38,7 +38,6 @@ spec: memory: {{ .Values.resources.jobs.db.requests.memory | quote }} {{- end }} command: - - bash - /tmp/db-sync.sh volumeMounts: - name: etcbarbican @@ -60,3 +59,4 @@ spec: - name: barbican-bin configMap: name: barbican-bin + defaultMode: 0555 diff --git a/barbican/templates/job-ks-endpoints.yaml b/barbican/templates/job-ks-endpoints.yaml index 359b74d31c..cb9cb2376a 100644 --- a/barbican/templates/job-ks-endpoints.yaml +++ b/barbican/templates/job-ks-endpoints.yaml @@ -41,7 +41,6 @@ spec: cpu: {{ $envAll.Values.resources.ks_endpoints.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-endpoints.sh volumeMounts: - name: ks-endpoints-sh @@ -66,3 +65,4 @@ spec: - name: ks-endpoints-sh configMap: name: barbican-bin + defaultMode: 0555 diff --git a/barbican/templates/job-ks-service.yaml b/barbican/templates/job-ks-service.yaml index 652d5dc789..f63c4565ca 100644 --- a/barbican/templates/job-ks-service.yaml +++ b/barbican/templates/job-ks-service.yaml @@ -40,7 +40,6 @@ spec: cpu: {{ $envAll.Values.resources.ks_service.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-service.sh volumeMounts: - name: ks-service-sh @@ -60,3 +59,4 @@ spec: - name: ks-service-sh configMap: name: barbican-bin + defaultMode: 0555 diff --git a/barbican/templates/job-ks-user.yaml b/barbican/templates/job-ks-user.yaml index 2bd5fb0c1f..af526735b8 100644 --- a/barbican/templates/job-ks-user.yaml +++ b/barbican/templates/job-ks-user.yaml @@ -40,7 +40,6 @@ spec: cpu: {{ .Values.resources.ks_user.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-user.sh volumeMounts: - name: ks-user-sh @@ -62,3 +61,4 @@ spec: - name: ks-user-sh configMap: name: barbican-bin + defaultMode: 0555 diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index 599c43ca59..73a1f0d09f 100644 --- a/cinder/templates/deployment-api.yaml +++ b/cinder/templates/deployment-api.yaml @@ -57,14 +57,12 @@ spec: cpu: {{ .Values.resources.cinder_api.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/cinder-api.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/cinder-api.sh - stop ports: @@ -99,6 +97,7 @@ spec: - name: cinder-bin configMap: name: cinder-bin + defaultMode: 0555 - name: cinder-etc configMap: name: cinder-etc diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index 57fc9788b3..33a66dc113 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/cinder/templates/deployment-scheduler.yaml @@ -56,7 +56,6 @@ spec: cpu: {{ .Values.resources.cinder_scheduler.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/cinder-scheduler.sh volumeMounts: - name: pod-var-cache-cinder @@ -84,6 +83,7 @@ spec: - name: cinder-bin configMap: name: cinder-bin + defaultMode: 0555 - name: cinder-etc configMap: name: cinder-etc diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index 4959cdb871..754452ffbe 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/cinder/templates/deployment-volume.yaml @@ -56,7 +56,6 @@ spec: cpu: {{ .Values.resources.cinder_volume.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/cinder-volume.sh volumeMounts: - name: pod-var-cache-cinder @@ -90,6 +89,7 @@ spec: - name: cinder-bin configMap: name: cinder-bin + defaultMode: 0555 - name: cinder-etc configMap: name: cinder-etc diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml index 6fed2b0f12..15f5b85108 100644 --- a/cinder/templates/job-db-init.yaml +++ b/cinder/templates/job-db-init.yaml @@ -52,7 +52,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: connection command: - - python - /tmp/db-init.py volumeMounts: - name: cinder-bin @@ -74,3 +73,4 @@ spec: - name: cinder-bin configMap: name: cinder-bin + defaultMode: 0555 diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml index 5d840cc36b..4e40e96589 100644 --- a/cinder/templates/job-db-sync.yaml +++ b/cinder/templates/job-db-sync.yaml @@ -40,7 +40,6 @@ spec: cpu: {{ .Values.resources.cinder_db_sync.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/db-sync.sh volumeMounts: - name: cinder-bin @@ -62,3 +61,4 @@ spec: - name: cinder-bin configMap: name: cinder-bin + defaultMode: 0555 diff --git a/cinder/templates/job-ks-endpoints.yaml b/cinder/templates/job-ks-endpoints.yaml index 8f42bde76e..0cdfd2bc89 100644 --- a/cinder/templates/job-ks-endpoints.yaml +++ b/cinder/templates/job-ks-endpoints.yaml @@ -43,7 +43,6 @@ spec: cpu: {{ $envAll.Values.resources.cinder_ks_endpoints.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-endpoints.sh volumeMounts: - name: ks-endpoints-sh @@ -68,3 +67,4 @@ spec: - name: ks-endpoints-sh configMap: name: cinder-bin + defaultMode: 0555 diff --git a/cinder/templates/job-ks-service.yaml b/cinder/templates/job-ks-service.yaml index 6f10890027..56ecfc1e26 100644 --- a/cinder/templates/job-ks-service.yaml +++ b/cinder/templates/job-ks-service.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ $envAll.Values.resources.cinder_ks_service.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-service.sh volumeMounts: - name: ks-service-sh @@ -62,3 +61,4 @@ spec: - name: ks-service-sh configMap: name: cinder-bin + defaultMode: 0555 diff --git a/cinder/templates/job-ks-user.yaml b/cinder/templates/job-ks-user.yaml index e3315c255b..521e9ea852 100644 --- a/cinder/templates/job-ks-user.yaml +++ b/cinder/templates/job-ks-user.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ .Values.resources.cinder_ks_user.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-user.sh volumeMounts: - name: ks-user-sh @@ -64,3 +63,4 @@ spec: - name: ks-user-sh configMap: name: cinder-bin + defaultMode: 0555 diff --git a/cinder/templates/job_bootstrap.yaml b/cinder/templates/job_bootstrap.yaml index dbfe4708da..bbc7414e87 100644 --- a/cinder/templates/job_bootstrap.yaml +++ b/cinder/templates/job_bootstrap.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ .Values.resources.bootstrap.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/bootstrap.sh env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} @@ -62,4 +61,5 @@ spec: - name: cinder-bin configMap: name: cinder-bin + defaultMode: 0555 {{- end }} diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index 5ba499966d..5a6c015b6d 100644 --- a/glance/templates/deployment-api.yaml +++ b/glance/templates/deployment-api.yaml @@ -57,14 +57,12 @@ spec: memory: {{ .Values.resources.api.requests.memory | quote }} {{- end }} command: - - bash - /tmp/glance-api.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/glance-api.sh - stop ports: @@ -111,6 +109,7 @@ spec: - name: glance-bin configMap: name: glance-bin + defaultMode: 0555 - name: glance-etc configMap: name: glance-etc diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index cf27b670fb..e9a3256539 100644 --- a/glance/templates/deployment-registry.yaml +++ b/glance/templates/deployment-registry.yaml @@ -49,14 +49,12 @@ spec: memory: {{ .Values.resources.registry.requests.memory | quote }} {{- end }} command: - - bash - /tmp/glance-registry.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/glance-registry.sh - stop ports: @@ -90,6 +88,7 @@ spec: - name: glance-bin configMap: name: glance-bin + defaultMode: 0555 - name: glance-etc configMap: name: glance-etc diff --git a/glance/templates/job-bootstrap.yaml b/glance/templates/job-bootstrap.yaml index d4bc65efc0..fd36e23def 100644 --- a/glance/templates/job-bootstrap.yaml +++ b/glance/templates/job-bootstrap.yaml @@ -45,7 +45,6 @@ spec: {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} command: - - bash - /tmp/bootstrap.sh volumeMounts: - name: imagedir @@ -64,6 +63,7 @@ spec: - name: glance-bin configMap: name: glance-bin + defaultMode: 0555 - name: glance-etc configMap: name: glance-etc diff --git a/glance/templates/job-db-init.yaml b/glance/templates/job-db-init.yaml index 20868eae72..76c9ba820b 100644 --- a/glance/templates/job-db-init.yaml +++ b/glance/templates/job-db-init.yaml @@ -52,7 +52,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: connection command: - - python - /tmp/db-init.py volumeMounts: - name: glance-bin @@ -74,3 +73,4 @@ spec: - name: glance-bin configMap: name: glance-bin + defaultMode: 0555 diff --git a/glance/templates/job-db-sync.yaml b/glance/templates/job-db-sync.yaml index 1102dd4cda..1f3e1f38db 100644 --- a/glance/templates/job-db-sync.yaml +++ b/glance/templates/job-db-sync.yaml @@ -40,7 +40,6 @@ spec: memory: {{ .Values.resources.jobs.db.requests.memory | quote }} {{- end }} command: - - bash - /tmp/db-sync.sh volumeMounts: - name: glance-bin @@ -62,3 +61,4 @@ spec: - name: glance-bin configMap: name: glance-bin + defaultMode: 0555 diff --git a/glance/templates/job-ks-endpoints.yaml b/glance/templates/job-ks-endpoints.yaml index 29c0706584..f163f4394d 100644 --- a/glance/templates/job-ks-endpoints.yaml +++ b/glance/templates/job-ks-endpoints.yaml @@ -43,7 +43,6 @@ spec: cpu: {{ $envAll.Values.resources.glance_ks_endpoints.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-endpoints.sh volumeMounts: - name: ks-endpoints-sh @@ -68,3 +67,4 @@ spec: - name: ks-endpoints-sh configMap: name: glance-bin + defaultMode: 0555 diff --git a/glance/templates/job-ks-service.yaml b/glance/templates/job-ks-service.yaml index 23252a89b2..aa6587cd1c 100644 --- a/glance/templates/job-ks-service.yaml +++ b/glance/templates/job-ks-service.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ $envAll.Values.resources.glance_ks_service.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-service.sh volumeMounts: - name: ks-service-sh @@ -62,3 +61,4 @@ spec: - name: ks-service-sh configMap: name: glance-bin + defaultMode: 0555 diff --git a/glance/templates/job-ks-user.yaml b/glance/templates/job-ks-user.yaml index 1fdd24e192..9ffd431709 100644 --- a/glance/templates/job-ks-user.yaml +++ b/glance/templates/job-ks-user.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ .Values.resources.glance_ks_user.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-user.sh volumeMounts: - name: ks-user-sh @@ -64,3 +63,4 @@ spec: - name: ks-user-sh configMap: name: glance-bin + defaultMode: 0555 diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index 33f9aab070..b2f052358f 100644 --- a/heat/templates/deployment-api.yaml +++ b/heat/templates/deployment-api.yaml @@ -57,14 +57,12 @@ spec: cpu: {{ .Values.resources.heat_api.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/heat-api.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/heat-api.sh - stop ports: @@ -102,6 +100,7 @@ spec: - name: heat-bin configMap: name: heat-bin + defaultMode: 0555 - name: heat-etc configMap: name: heat-etc diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index 8dc251a95a..dc0071b47c 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/heat/templates/deployment-cfn.yaml @@ -57,14 +57,12 @@ spec: cpu: {{ .Values.resources.heat_cfn.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/heat-cfn.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/heat-cfn.sh - stop ports: @@ -102,6 +100,7 @@ spec: - name: heat-bin configMap: name: heat-bin + defaultMode: 0555 - name: heat-etc configMap: name: heat-etc diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index 50fe32cbab..ca8c569eee 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/heat/templates/deployment-cloudwatch.yaml @@ -57,14 +57,12 @@ spec: cpu: {{ .Values.resources.heat_cloudwatch.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/heat-cloudwatch.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/heat-cloudwatch.sh - stop ports: @@ -102,6 +100,7 @@ spec: - name: heat-bin configMap: name: heat-bin + defaultMode: 0555 - name: heat-etc configMap: name: heat-etc diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml index de957d04e1..d61b2f9d66 100644 --- a/heat/templates/job-db-init.yaml +++ b/heat/templates/job-db-init.yaml @@ -52,7 +52,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: connection command: - - python - /tmp/db-init.py volumeMounts: - name: heat-bin @@ -74,3 +73,4 @@ spec: - name: heat-bin configMap: name: heat-bin + defaultMode: 0555 diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml index 70c486f711..cb4e594096 100644 --- a/heat/templates/job-db-sync.yaml +++ b/heat/templates/job-db-sync.yaml @@ -40,7 +40,6 @@ spec: cpu: {{ .Values.resources.heat_db_sync.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/db-sync.sh volumeMounts: - name: heat-bin @@ -62,3 +61,4 @@ spec: - name: heat-bin configMap: name: heat-bin + defaultMode: 0555 diff --git a/heat/templates/job-ks-endpoints.yaml b/heat/templates/job-ks-endpoints.yaml index 8153f5e4b5..9010a55daf 100644 --- a/heat/templates/job-ks-endpoints.yaml +++ b/heat/templates/job-ks-endpoints.yaml @@ -43,7 +43,6 @@ spec: cpu: {{ $envAll.Values.resources.heat_ks_endpoints.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-endpoints.sh volumeMounts: - name: ks-endpoints-sh @@ -68,3 +67,4 @@ spec: - name: ks-endpoints-sh configMap: name: heat-bin + defaultMode: 0555 diff --git a/heat/templates/job-ks-service.yaml b/heat/templates/job-ks-service.yaml index fbe33bc266..22de825ca8 100644 --- a/heat/templates/job-ks-service.yaml +++ b/heat/templates/job-ks-service.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ $envAll.Values.resources.heat_ks_service.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-service.sh volumeMounts: - name: ks-service-sh @@ -62,3 +61,4 @@ spec: - name: ks-service-sh configMap: name: heat-bin + defaultMode: 0555 diff --git a/heat/templates/job-ks-user.yaml b/heat/templates/job-ks-user.yaml index f8bc02893f..f954fa2a9c 100644 --- a/heat/templates/job-ks-user.yaml +++ b/heat/templates/job-ks-user.yaml @@ -45,7 +45,6 @@ spec: cpu: {{ .Values.resources.heat_ks_user.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-user.sh volumeMounts: - name: ks-user-sh @@ -128,3 +127,4 @@ spec: - name: ks-user-sh configMap: name: heat-bin + defaultMode: 0555 diff --git a/heat/templates/statefulset-engine.yaml b/heat/templates/statefulset-engine.yaml index 1e34c9ff75..26333db711 100644 --- a/heat/templates/statefulset-engine.yaml +++ b/heat/templates/statefulset-engine.yaml @@ -46,7 +46,6 @@ spec: cpu: {{ .Values.resources.heat_engine.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/heat-engine.sh volumeMounts: - name: pod-etc-heat @@ -74,6 +73,7 @@ spec: - name: heat-bin configMap: name: heat-bin + defaultMode: 0555 - name: heat-etc configMap: name: heat-etc diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index 59a37f85f7..a46610fea2 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -57,14 +57,12 @@ spec: memory: {{ .Values.resources.dashboard.requests.memory | quote }} {{- end }} command: - - bash - /tmp/horizon.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/horizon.sh - stop ports: @@ -92,6 +90,7 @@ spec: - name: startsh configMap: name: horizon-bin + defaultMode: 0555 - name: horizon-etc configMap: name: horizon-etc diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment.yaml index 9a5060e8d5..e710dd44f3 100644 --- a/keystone/templates/deployment.yaml +++ b/keystone/templates/deployment.yaml @@ -57,14 +57,12 @@ spec: memory: {{ .Values.resources.api.requests.memory | quote }} {{- end }} command: - - bash - /tmp/keystone-api.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/keystone-api.sh - stop ports: @@ -116,4 +114,5 @@ spec: - name: keystone-bin configMap: name: keystone-bin + defaultMode: 0555 {{ if $mounts_keystone_api.volumes }}{{ toYaml $mounts_keystone_api.volumes | indent 6 }}{{ end }} diff --git a/keystone/templates/job-db-init.yaml b/keystone/templates/job-db-init.yaml index a75763f4f3..d8727d2249 100644 --- a/keystone/templates/job-db-init.yaml +++ b/keystone/templates/job-db-init.yaml @@ -56,7 +56,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: connection command: - - python - /tmp/db-init.py volumeMounts: - name: etckeystone @@ -79,4 +78,5 @@ spec: - name: keystone-bin configMap: name: keystone-bin + defaultMode: 0555 {{ if $mounts_keystone_db_init.volumes }}{{ toYaml $mounts_keystone_db_init.volumes | indent 6 }}{{ end }} diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml index 26cd8776f9..2341b150db 100644 --- a/keystone/templates/job-db-sync.yaml +++ b/keystone/templates/job-db-sync.yaml @@ -44,7 +44,6 @@ spec: memory: {{ .Values.resources.jobs.db_sync.requests.memory | quote }} {{- end }} command: - - bash - /tmp/db-sync.sh volumeMounts: - name: etckeystone @@ -67,4 +66,5 @@ spec: - name: keystone-bin configMap: name: keystone-bin + defaultMode: 0555 {{ if $mounts_keystone_db_sync.volumes }}{{ toYaml $mounts_keystone_db_sync.volumes | indent 6 }}{{ end }} diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index d5d1229178..48c09ca5cf 100644 --- a/magnum/templates/deployment-api.yaml +++ b/magnum/templates/deployment-api.yaml @@ -57,14 +57,12 @@ spec: cpu: {{ .Values.resources.magnum_api.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/magnum-api.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/magnum-api.sh - stop ports: @@ -102,6 +100,7 @@ spec: - name: magnum-bin configMap: name: magnum-bin + defaultMode: 0555 - name: magnum-etc configMap: name: magnum-etc diff --git a/magnum/templates/job-db-init.yaml b/magnum/templates/job-db-init.yaml index fa892b4f2d..b6dc35875e 100644 --- a/magnum/templates/job-db-init.yaml +++ b/magnum/templates/job-db-init.yaml @@ -52,7 +52,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: connection command: - - python - /tmp/db-init.py volumeMounts: - name: magnum-bin @@ -74,3 +73,4 @@ spec: - name: magnum-bin configMap: name: magnum-bin + defaultMode: 0555 diff --git a/magnum/templates/job-db-sync.yaml b/magnum/templates/job-db-sync.yaml index 59c9099c3c..2e78bd8a7d 100644 --- a/magnum/templates/job-db-sync.yaml +++ b/magnum/templates/job-db-sync.yaml @@ -40,7 +40,6 @@ spec: cpu: {{ .Values.resources.magnum_db_sync.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/db-sync.sh volumeMounts: - name: magnum-bin @@ -62,3 +61,4 @@ spec: - name: magnum-bin configMap: name: magnum-bin + defaultMode: 0555 diff --git a/magnum/templates/job-ks-endpoints.yaml b/magnum/templates/job-ks-endpoints.yaml index fd7df3ee32..726f953bec 100644 --- a/magnum/templates/job-ks-endpoints.yaml +++ b/magnum/templates/job-ks-endpoints.yaml @@ -43,7 +43,6 @@ spec: cpu: {{ $envAll.Values.resources.magnum_ks_endpoints.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-endpoints.sh volumeMounts: - name: ks-endpoints-sh @@ -68,3 +67,4 @@ spec: - name: ks-endpoints-sh configMap: name: magnum-bin + defaultMode: 0555 diff --git a/magnum/templates/job-ks-service.yaml b/magnum/templates/job-ks-service.yaml index 056db19acf..9428363473 100644 --- a/magnum/templates/job-ks-service.yaml +++ b/magnum/templates/job-ks-service.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ $envAll.Values.resources.magnum_ks_service.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-service.sh volumeMounts: - name: ks-service-sh @@ -62,3 +61,4 @@ spec: - name: ks-service-sh configMap: name: magnum-bin + defaultMode: 0555 diff --git a/magnum/templates/job-ks-user.yaml b/magnum/templates/job-ks-user.yaml index 40be7e2d1b..2f24ca11bd 100644 --- a/magnum/templates/job-ks-user.yaml +++ b/magnum/templates/job-ks-user.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ .Values.resources.magnum_ks_user.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-user.sh volumeMounts: - name: ks-user-sh @@ -64,3 +63,4 @@ spec: - name: ks-user-sh configMap: name: magnum-bin + defaultMode: 0555 diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml index 885d04bfb7..eda44f75ce 100644 --- a/magnum/templates/statefulset-conductor.yaml +++ b/magnum/templates/statefulset-conductor.yaml @@ -46,7 +46,6 @@ spec: cpu: {{ .Values.resources.magnum_conductor.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/magnum-conductor.sh volumeMounts: - name: magnum-bin @@ -74,6 +73,7 @@ spec: - name: magnum-bin configMap: name: magnum-bin + defaultMode: 0555 - name: magnum-etc configMap: name: magnum-etc diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml index c5d0791e9d..dc4a53f936 100644 --- a/mariadb/templates/statefulset.yaml +++ b/mariadb/templates/statefulset.yaml @@ -63,7 +63,6 @@ spec: memory: {{ .Values.resources.api.requests.memory | quote }} {{- end }} command: - - bash - /tmp/start.sh env: - name: POD_IP @@ -77,7 +76,6 @@ spec: readinessProbe: exec: command: - - bash - /tmp/readiness.sh volumeMounts: - name: mycnfd @@ -114,6 +112,7 @@ spec: - name: mariadb-bin configMap: name: mariadb-bin + defaultMode: 0555 - name: mariadb-etc configMap: name: mariadb-etc diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index ae86d68613..c30f1f4150 100644 --- a/mistral/templates/deployment-api.yaml +++ b/mistral/templates/deployment-api.yaml @@ -57,14 +57,12 @@ spec: memory: {{ .Values.resources.api.requests.memory | quote }} {{- end }} command: - - bash - /tmp/mistral-api.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/mistral-api.sh - stop ports: @@ -95,6 +93,7 @@ spec: - name: mistral-bin configMap: name: mistral-bin + defaultMode: 0555 - name: mistral-etc configMap: name: mistral-etc diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index e6ee448110..7514bed8c6 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/mistral/templates/deployment-executor.yaml @@ -56,7 +56,6 @@ spec: memory: {{ .Values.resources.executor.requests.memory | quote }} {{- end }} command: - - bash - /tmp/mistral-executor.sh volumeMounts: - name: pod-etc-mistral @@ -76,6 +75,7 @@ spec: - name: mistral-bin configMap: name: mistral-bin + defaultMode: 0555 - name: mistral-etc configMap: name: mistral-etc diff --git a/mistral/templates/job-db-init.yaml b/mistral/templates/job-db-init.yaml index 39422fa746..fd595c2d55 100644 --- a/mistral/templates/job-db-init.yaml +++ b/mistral/templates/job-db-init.yaml @@ -52,7 +52,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: connection command: - - python - /tmp/db-init.py volumeMounts: - name: mistral-bin @@ -69,6 +68,7 @@ spec: - name: mistral-bin configMap: name: mistral-bin + defaultMode: 0555 - name: pod-etc-mistral emptyDir: {} - name: mistral-etc diff --git a/mistral/templates/job-db-sync.yaml b/mistral/templates/job-db-sync.yaml index 50c318985b..72839c7f16 100644 --- a/mistral/templates/job-db-sync.yaml +++ b/mistral/templates/job-db-sync.yaml @@ -41,7 +41,6 @@ spec: cpu: {{ .Values.resources.mistral_db_sync.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/db-sync.sh volumeMounts: - name: pod-etc-mistral @@ -63,3 +62,4 @@ spec: - name: mistral-bin configMap: name: mistral-bin + defaultMode: 0555 diff --git a/mistral/templates/job-ks-endpoints.yaml b/mistral/templates/job-ks-endpoints.yaml index c022d13473..7f43b08a58 100644 --- a/mistral/templates/job-ks-endpoints.yaml +++ b/mistral/templates/job-ks-endpoints.yaml @@ -43,7 +43,6 @@ spec: cpu: {{ $envAll.Values.resources.mistral_ks_endpoints.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-endpoints.sh volumeMounts: - name: ks-endpoints-sh @@ -68,3 +67,4 @@ spec: - name: ks-endpoints-sh configMap: name: mistral-bin + defaultMode: 0555 diff --git a/mistral/templates/job-ks-service.yaml b/mistral/templates/job-ks-service.yaml index ab0a12780d..04de18a594 100644 --- a/mistral/templates/job-ks-service.yaml +++ b/mistral/templates/job-ks-service.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ $envAll.Values.resources.mistral_ks_service.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-service.sh volumeMounts: - name: ks-service-sh @@ -62,3 +61,4 @@ spec: - name: ks-service-sh configMap: name: mistral-bin + defaultMode: 0555 diff --git a/mistral/templates/job-ks-user.yaml b/mistral/templates/job-ks-user.yaml index 0761f8abe7..bda79d5cb7 100644 --- a/mistral/templates/job-ks-user.yaml +++ b/mistral/templates/job-ks-user.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ .Values.resources.mistral_ks_user.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-user.sh volumeMounts: - name: ks-user-sh @@ -64,3 +63,4 @@ spec: - name: ks-user-sh configMap: name: mistral-bin + defaultMode: 0555 diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml index 2a336b1a13..fa5c321e8b 100644 --- a/mistral/templates/statefulset-engine.yaml +++ b/mistral/templates/statefulset-engine.yaml @@ -46,7 +46,6 @@ spec: memory: {{ .Values.resources.engine.requests.memory | quote }} {{- end }} command: - - bash - /tmp/mistral-engine.sh volumeMounts: - name: pod-etc-mistral @@ -66,6 +65,7 @@ spec: - name: mistral-bin configMap: name: mistral-bin + defaultMode: 0555 - name: mistral-etc configMap: name: mistral-etc diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml index 10b4665db7..b15fd18379 100644 --- a/mistral/templates/statefulset-event-engine.yaml +++ b/mistral/templates/statefulset-event-engine.yaml @@ -46,7 +46,6 @@ spec: memory: {{ .Values.resources.event_engine.requests.memory | quote }} {{- end }} command: - - bash - /tmp/mistral-event-engine.sh volumeMounts: - name: pod-etc-mistral @@ -66,6 +65,7 @@ spec: - name: mistral-bin configMap: name: mistral-bin + defaultMode: 0555 - name: mistral-etc configMap: name: mistral-etc diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml index 8a390aaee5..6735ee8588 100644 --- a/neutron/templates/daemonset-dhcp-agent.yaml +++ b/neutron/templates/daemonset-dhcp-agent.yaml @@ -53,7 +53,6 @@ spec: securityContext: privileged: true command: - - bash - /tmp/neutron-dhcp-agent.sh volumeMounts: - name: neutron-bin @@ -93,6 +92,7 @@ spec: - name: neutron-bin configMap: name: neutron-bin + defaultMode: 0555 - name: neutron-etc configMap: name: neutron-etc diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml index d19f4da479..99dcadec0d 100644 --- a/neutron/templates/daemonset-l3-agent.yaml +++ b/neutron/templates/daemonset-l3-agent.yaml @@ -53,7 +53,6 @@ spec: securityContext: privileged: true command: - - bash - /tmp/neutron-l3-agent.sh volumeMounts: - name: neutron-bin @@ -92,6 +91,7 @@ spec: - name: neutron-bin configMap: name: neutron-bin + defaultMode: 0555 - name: neutron-etc configMap: name: neutron-etc diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml index 1bb92530cb..93cd937b66 100644 --- a/neutron/templates/daemonset-metadata-agent.yaml +++ b/neutron/templates/daemonset-metadata-agent.yaml @@ -55,7 +55,6 @@ spec: ports: - containerPort: {{ .Values.network.metadata.port }} command: - - bash - /tmp/neutron-metadata-agent.sh volumeMounts: - name: neutron-bin @@ -91,6 +90,7 @@ spec: - name: neutron-bin configMap: name: neutron-bin + defaultMode: 0555 - name: neutron-etc configMap: name: neutron-etc diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index 6e3fe76732..3d43e419bd 100644 --- a/neutron/templates/daemonset-ovs-agent.yaml +++ b/neutron/templates/daemonset-ovs-agent.yaml @@ -53,7 +53,6 @@ spec: securityContext: privileged: true command: - - bash - /tmp/neutron-openvswitch-agent.sh # ensures this container can can see a br-int # bridge before its marked as ready @@ -95,6 +94,7 @@ spec: - name: neutron-bin configMap: name: neutron-bin + defaultMode: 0555 - name: neutron-etc configMap: name: neutron-etc diff --git a/neutron/templates/daemonset-ovs-db.yaml b/neutron/templates/daemonset-ovs-db.yaml index f67e41d9a2..9a60dcb9e4 100644 --- a/neutron/templates/daemonset-ovs-db.yaml +++ b/neutron/templates/daemonset-ovs-db.yaml @@ -47,7 +47,6 @@ spec: securityContext: privileged: true command: - - bash - /tmp/openvswitch-db-server.sh volumeMounts: - name: neutron-bin @@ -66,6 +65,7 @@ spec: - name: neutron-bin configMap: name: neutron-bin + defaultMode: 0555 - name: varlibopenvswitch emptyDir: {} - name: neutron-etc diff --git a/neutron/templates/daemonset-ovs-vswitchd.yaml b/neutron/templates/daemonset-ovs-vswitchd.yaml index e3127a5561..166a5b885f 100644 --- a/neutron/templates/daemonset-ovs-vswitchd.yaml +++ b/neutron/templates/daemonset-ovs-vswitchd.yaml @@ -54,7 +54,6 @@ spec: - /usr/bin/ovs-vsctl - show command: - - bash - /tmp/openvswitch-vswitchd.sh volumeMounts: - name: neutron-bin @@ -74,6 +73,7 @@ spec: - name: neutron-bin configMap: name: neutron-bin + defaultMode: 0555 - name: libmodules hostPath: path: /lib/modules diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index 1465d28100..0f4c19f409 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -57,14 +57,12 @@ spec: memory: {{ .Values.resources.server.requests.memory | quote }} {{- end }} command: - - bash - /tmp/neutron-server.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/neutron-server.sh - stop ports: @@ -98,6 +96,7 @@ spec: - name: neutron-bin configMap: name: neutron-bin + defaultMode: 0555 - name: neutron-etc configMap: name: neutron-etc diff --git a/neutron/templates/job-db-init.yaml b/neutron/templates/job-db-init.yaml index a857da95d6..333f6ed0dd 100644 --- a/neutron/templates/job-db-init.yaml +++ b/neutron/templates/job-db-init.yaml @@ -43,7 +43,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: connection command: - - python - /tmp/db-init.py volumeMounts: - name: neutron-bin @@ -65,3 +64,4 @@ spec: - name: neutron-bin configMap: name: neutron-bin + defaultMode: 0555 diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml index 18c99a80ca..4c746370b8 100644 --- a/neutron/templates/job-db-sync.yaml +++ b/neutron/templates/job-db-sync.yaml @@ -48,7 +48,6 @@ spec: memory: {{ .Values.resources.jobs.db_sync.requests.memory | quote }} {{- end }} command: - - bash - /tmp/db-sync.sh volumeMounts: - name: neutron-bin @@ -74,3 +73,4 @@ spec: - name: neutron-bin configMap: name: neutron-bin + defaultMode: 0555 diff --git a/neutron/templates/job-ks-endpoints.yaml b/neutron/templates/job-ks-endpoints.yaml index 29bbf79db2..d359ac9f87 100644 --- a/neutron/templates/job-ks-endpoints.yaml +++ b/neutron/templates/job-ks-endpoints.yaml @@ -43,7 +43,6 @@ spec: cpu: {{ $envAll.Values.resources.neutron_ks_endpoints.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-endpoints.sh volumeMounts: - name: ks-endpoints-sh @@ -68,3 +67,4 @@ spec: - name: ks-endpoints-sh configMap: name: neutron-bin + defaultMode: 0555 diff --git a/neutron/templates/job-ks-service.yaml b/neutron/templates/job-ks-service.yaml index 8611d86899..10025ce037 100644 --- a/neutron/templates/job-ks-service.yaml +++ b/neutron/templates/job-ks-service.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ $envAll.Values.resources.neutron_ks_service.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-service.sh volumeMounts: - name: ks-service-sh @@ -62,3 +61,4 @@ spec: - name: ks-service-sh configMap: name: neutron-bin + defaultMode: 0555 diff --git a/neutron/templates/job-ks-user.yaml b/neutron/templates/job-ks-user.yaml index 4675f8ebf1..e9a80ca531 100644 --- a/neutron/templates/job-ks-user.yaml +++ b/neutron/templates/job-ks-user.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ .Values.resources.neutron_ks_user.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-user.sh volumeMounts: - name: ks-user-sh @@ -64,3 +63,4 @@ spec: - name: ks-user-sh configMap: name: neutron-bin + defaultMode: 0555 diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml index 1d7a38c269..6c188fd9e2 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/nova/templates/daemonset-compute.yaml @@ -55,7 +55,6 @@ spec: securityContext: privileged: true command: - - bash - /tmp/nova-compute.sh volumeMounts: - name: nova-bin @@ -98,6 +97,7 @@ spec: - name: nova-bin configMap: name: nova-bin + defaultMode: 0555 - name: nova-etc configMap: name: nova-etc diff --git a/nova/templates/daemonset-libvirt.yaml b/nova/templates/daemonset-libvirt.yaml index e570d2a2cd..32e4b7aba3 100644 --- a/nova/templates/daemonset-libvirt.yaml +++ b/nova/templates/daemonset-libvirt.yaml @@ -47,7 +47,6 @@ spec: postStart: exec: command: - - bash - /tmp/ceph-secret-define.sh {{- end }} {{- if .Values.resources.enabled }} @@ -62,7 +61,6 @@ spec: securityContext: privileged: true command: - - bash - /tmp/libvirt.sh volumeMounts: - name: nova-bin @@ -121,6 +119,7 @@ spec: - name: nova-bin configMap: name: nova-bin + defaultMode: 0555 - name: nova-etc configMap: name: nova-etc diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml index e18849e16f..98bc525c08 100644 --- a/nova/templates/deployment-api-metadata.yaml +++ b/nova/templates/deployment-api-metadata.yaml @@ -63,14 +63,12 @@ spec: add: - NET_ADMIN command: - - bash - /tmp/nova-api-metadata.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/nova-api-metadata.sh - stop ports: @@ -96,6 +94,7 @@ spec: - name: nova-bin configMap: name: nova-bin + defaultMode: 0555 - name: nova-etc configMap: name: nova-etc diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml index 7ef05f81e9..a882fc652b 100644 --- a/nova/templates/deployment-api-osapi.yaml +++ b/nova/templates/deployment-api-osapi.yaml @@ -57,14 +57,12 @@ spec: cpu: {{ .Values.resources.nova_osapi.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/nova-api.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/nova-api.sh - stop ports: @@ -90,6 +88,7 @@ spec: - name: nova-bin configMap: name: nova-bin + defaultMode: 0555 - name: nova-etc configMap: name: nova-etc diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml index 12d6eea010..136ddf859c 100644 --- a/nova/templates/deployment-conductor.yaml +++ b/nova/templates/deployment-conductor.yaml @@ -56,7 +56,6 @@ spec: cpu: {{ .Values.resources.nova_conductor.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/nova-conductor.sh volumeMounts: - name: nova-bin @@ -72,6 +71,7 @@ spec: - name: nova-bin configMap: name: nova-bin + defaultMode: 0555 - name: nova-etc configMap: name: nova-etc diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml index 11274d2124..5ab297404e 100644 --- a/nova/templates/deployment-consoleauth.yaml +++ b/nova/templates/deployment-consoleauth.yaml @@ -57,7 +57,6 @@ spec: cpu: {{ .Values.resources.nova_consoleauth.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/nova-consoleauth.sh volumeMounts: - name: nova-bin @@ -73,6 +72,7 @@ spec: - name: nova-bin configMap: name: nova-bin + defaultMode: 0555 - name: nova-etc configMap: name: nova-etc diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml index 4e2efd8d18..a9467d5bf1 100644 --- a/nova/templates/deployment-scheduler.yaml +++ b/nova/templates/deployment-scheduler.yaml @@ -57,7 +57,6 @@ spec: cpu: {{ .Values.resources.nova_scheduler.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/nova-scheduler.sh volumeMounts: - name: nova-bin @@ -73,6 +72,7 @@ spec: - name: nova-bin configMap: name: nova-bin + defaultMode: 0555 - name: nova-etc configMap: name: nova-etc diff --git a/nova/templates/job-bootstrap.yaml b/nova/templates/job-bootstrap.yaml index 4b10e5db56..b2bf5b8e13 100644 --- a/nova/templates/job-bootstrap.yaml +++ b/nova/templates/job-bootstrap.yaml @@ -43,7 +43,6 @@ spec: cpu: {{ .Values.resources.bootstrap.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/bootstrap.sh env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} @@ -66,4 +65,5 @@ spec: - name: nova-bin configMap: name: nova-bin + defaultMode: 0555 {{ if $mounts_nova_bootstrap.volumes }}{{ toYaml $mounts_nova_bootstrap.volumes | indent 8 }}{{ end }} diff --git a/nova/templates/job-db-init.yaml b/nova/templates/job-db-init.yaml index f01c2ca7b6..228ce31da9 100644 --- a/nova/templates/job-db-init.yaml +++ b/nova/templates/job-db-init.yaml @@ -52,7 +52,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: connection command: - - python - /tmp/db-init.py volumeMounts: - name: nova-bin @@ -90,7 +89,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: connection command: - - python - /tmp/db-init.py volumeMounts: - name: nova-bin @@ -112,3 +110,4 @@ spec: - name: nova-bin configMap: name: nova-bin + defaultMode: 0555 diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml index 0af5d389e0..ca1ac4b10e 100644 --- a/nova/templates/job-db-sync.yaml +++ b/nova/templates/job-db-sync.yaml @@ -40,7 +40,6 @@ spec: cpu: {{ .Values.resources.nova_db_sync.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/db-sync.sh volumeMounts: - name: nova-bin @@ -62,3 +61,4 @@ spec: - name: nova-bin configMap: name: nova-bin + defaultMode: 0555 diff --git a/nova/templates/job-ks-endpoints.yaml b/nova/templates/job-ks-endpoints.yaml index 69f5aa7d85..68902ea2b8 100644 --- a/nova/templates/job-ks-endpoints.yaml +++ b/nova/templates/job-ks-endpoints.yaml @@ -43,7 +43,6 @@ spec: cpu: {{ $envAll.Values.resources.nova_ks_endpoints.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-endpoints.sh volumeMounts: - name: ks-endpoints-sh @@ -68,3 +67,4 @@ spec: - name: ks-endpoints-sh configMap: name: nova-bin + defaultMode: 0555 diff --git a/nova/templates/job-ks-service.yaml b/nova/templates/job-ks-service.yaml index d8314d5158..60dbaf78e2 100644 --- a/nova/templates/job-ks-service.yaml +++ b/nova/templates/job-ks-service.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ $envAll.Values.resources.nova_ks_service.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-service.sh volumeMounts: - name: ks-service-sh @@ -62,3 +61,4 @@ spec: - name: ks-service-sh configMap: name: nova-bin + defaultMode: 0555 diff --git a/nova/templates/job-ks-user.yaml b/nova/templates/job-ks-user.yaml index badc6df7dd..44de01b8a5 100644 --- a/nova/templates/job-ks-user.yaml +++ b/nova/templates/job-ks-user.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ .Values.resources.nova_ks_user.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-user.sh volumeMounts: - name: ks-user-sh @@ -64,3 +63,4 @@ spec: - name: ks-user-sh configMap: name: nova-bin + defaultMode: 0555 diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml index 340d1fe300..316d6a7f78 100644 --- a/senlin/templates/deployment-api.yaml +++ b/senlin/templates/deployment-api.yaml @@ -57,14 +57,12 @@ spec: cpu: {{ .Values.resources.senlin_api.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/senlin-api.sh - start lifecycle: preStop: exec: command: - - bash - /tmp/senlin-api.sh - stop ports: @@ -102,6 +100,7 @@ spec: - name: senlin-bin configMap: name: senlin-bin + defaultMode: 0555 - name: senlin-etc configMap: name: senlin-etc diff --git a/senlin/templates/job-db-init.yaml b/senlin/templates/job-db-init.yaml index 7067e9991f..78a31ec6e5 100644 --- a/senlin/templates/job-db-init.yaml +++ b/senlin/templates/job-db-init.yaml @@ -52,7 +52,6 @@ spec: - name: OPENSTACK_CONFIG_DB_KEY value: connection command: - - python - /tmp/db-init.py volumeMounts: - name: senlin-bin @@ -74,3 +73,4 @@ spec: - name: senlin-bin configMap: name: senlin-bin + defaultMode: 0555 diff --git a/senlin/templates/job-db-sync.yaml b/senlin/templates/job-db-sync.yaml index 618c4a0698..ee5261827c 100644 --- a/senlin/templates/job-db-sync.yaml +++ b/senlin/templates/job-db-sync.yaml @@ -40,7 +40,6 @@ spec: cpu: {{ .Values.resources.senlin_db_sync.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/db-sync.sh volumeMounts: - name: senlin-bin @@ -62,3 +61,4 @@ spec: - name: senlin-bin configMap: name: senlin-bin + defaultMode: 0555 diff --git a/senlin/templates/job-ks-endpoints.yaml b/senlin/templates/job-ks-endpoints.yaml index a8df38aea0..5d307d92da 100644 --- a/senlin/templates/job-ks-endpoints.yaml +++ b/senlin/templates/job-ks-endpoints.yaml @@ -43,7 +43,6 @@ spec: cpu: {{ $envAll.Values.resources.senlin_ks_endpoints.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-endpoints.sh volumeMounts: - name: ks-endpoints-sh @@ -68,3 +67,4 @@ spec: - name: ks-endpoints-sh configMap: name: senlin-bin + defaultMode: 0555 diff --git a/senlin/templates/job-ks-service.yaml b/senlin/templates/job-ks-service.yaml index 43a60d13f8..cf345a2c88 100644 --- a/senlin/templates/job-ks-service.yaml +++ b/senlin/templates/job-ks-service.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ $envAll.Values.resources.senlin_ks_service.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-service.sh volumeMounts: - name: ks-service-sh @@ -62,3 +61,4 @@ spec: - name: ks-service-sh configMap: name: senlin-bin + defaultMode: 0555 diff --git a/senlin/templates/job-ks-user.yaml b/senlin/templates/job-ks-user.yaml index 4f22fa30cc..2d1a3655e0 100644 --- a/senlin/templates/job-ks-user.yaml +++ b/senlin/templates/job-ks-user.yaml @@ -42,7 +42,6 @@ spec: cpu: {{ .Values.resources.senlin_ks_user.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/ks-user.sh volumeMounts: - name: ks-user-sh @@ -64,3 +63,4 @@ spec: - name: ks-user-sh configMap: name: senlin-bin + defaultMode: 0555 diff --git a/senlin/templates/statefulset-engine.yaml b/senlin/templates/statefulset-engine.yaml index 75d81be703..55605ed731 100644 --- a/senlin/templates/statefulset-engine.yaml +++ b/senlin/templates/statefulset-engine.yaml @@ -46,7 +46,6 @@ spec: cpu: {{ .Values.resources.senlin_engine.limits.cpu | quote }} {{- end }} command: - - bash - /tmp/senlin-engine.sh volumeMounts: - name: senlin-bin @@ -74,6 +73,7 @@ spec: - name: senlin-bin configMap: name: senlin-bin + defaultMode: 0555 - name: senlin-etc configMap: name: senlin-etc