openstack/openstack-helm
Code Issues Proposed changes

Merge "feat(cinder): allow users to provide configs in cinder.conf.d"

Browse Source
This commit is contained in:
Zuul
2026-02-20 02:21:51 +00:00
committed by Gerrit Code Review
parent 8a90b438d4 06a5261a0c
commit 62e674d54a
13 changed files with 109 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/templates/bin/_cinder-backup.sh.tpl
View File

@@ -16,4 +16,5 @@ limitations under the License.
set -ex
exec cinder-backup \
--config-file /etc/cinder/cinder.conf
--config-file /etc/cinder/cinder.conf \
--config-dir /etc/cinder/cinder.conf.d

3
cinder/templates/bin/_cinder-scheduler.sh.tpl
View File

@@ -16,4 +16,5 @@ limitations under the License.
set -ex
exec cinder-scheduler \
--config-file /etc/cinder/cinder.conf
--config-file /etc/cinder/cinder.conf \
--config-dir /etc/cinder/cinder.conf.d

3
cinder/templates/bin/_cinder-volume.sh.tpl
View File

@@ -18,4 +18,5 @@ set -ex
exec cinder-volume \
--config-file /etc/cinder/cinder.conf \
--config-file /etc/cinder/conf/backends.conf \
--config-file /tmp/pod-shared/internal_tenant.conf
--config-file /tmp/pod-shared/internal_tenant.conf \
--config-dir /etc/cinder/cinder.conf.d

5
cinder/templates/bin/_db-purge.sh.tpl
View File

@@ -16,4 +16,7 @@ limitations under the License.
set -ex
exec cinder-manage db purge {{ .Values.conf.db_purge.before }}
exec cinder-manage \
--config-file /etc/cinder/cinder.conf \
--config-dir /etc/cinder/cinder.conf.d \
db purge {{ .Values.conf.db_purge.before }}

5
cinder/templates/bin/_volume-usage-audit.sh.tpl
View File

@@ -16,4 +16,7 @@ limitations under the License.
set -ex
exec cinder-volume-usage-audit --send_actions
exec cinder-volume-usage-audit \
--config-file /etc/cinder/cinder.conf \
--config-dir /etc/cinder/cinder.conf.d \
--send_actions

13
cinder/templates/cron-job-cinder-db-purge.yaml
View File

@@ -20,6 +20,8 @@ limitations under the License.
{{- $serviceAccountName := "cinder-db-purge" }}
{{ tuple $envAll "db_purge" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $etcSources := .Values.pod.etcSources.cinder_db_purge }}
---
apiVersion: batch/v1
kind: CronJob
@@ -82,6 +84,9 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
- name: cinder-etc-snippets
mountPath: /etc/cinder/cinder.conf.d/
readOnly: true
{{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
@@ -105,6 +110,14 @@ spec:
secret:
secretName: cinder-etc
defaultMode: 0444
- name: cinder-etc-snippets
{{- if $etcSources }}
projected:
sources:
{{ toYaml $etcSources | indent 18 }}
{{- else }}
emptyDir: {}
{{ end }}
- name: cinder-bin
configMap:
name: cinder-bin

13
cinder/templates/cron-job-cinder-volume-usage-audit.yaml
View File

@@ -20,6 +20,8 @@ limitations under the License.
{{- $serviceAccountName := "cinder-volume-usage-audit" }}
{{ tuple $envAll "volume_usage_audit" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $etcSources := .Values.pod.etcSources.cinder_volume_usage_audit }}
---
apiVersion: batch/v1
kind: CronJob
@@ -82,6 +84,9 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
- name: cinder-etc-snippets
mountPath: /etc/cinder/cinder.conf.d/
readOnly: true
{{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
@@ -105,6 +110,14 @@ spec:
secret:
secretName: cinder-etc
defaultMode: 0444
- name: cinder-etc-snippets
{{- if $etcSources }}
projected:
sources:
{{ toYaml $etcSources | indent 18 }}
{{- else }}
emptyDir: {}
{{ end }}
- name: cinder-bin
configMap:
name: cinder-bin

13
cinder/templates/deployment-api.yaml
View File

@@ -34,6 +34,8 @@ httpGet:
{{- $serviceAccountName := "cinder-api" }}
{{ tuple $envAll "api" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $etcSources := .Values.pod.etcSources.cinder_api }}
---
apiVersion: apps/v1
kind: Deployment
@@ -130,6 +132,9 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
- name: cinder-etc-snippets
mountPath: /etc/cinder/cinder.conf.d/
readOnly: true
{{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
@@ -189,6 +194,14 @@ spec:
secret:
secretName: cinder-etc
defaultMode: 0444
- name: cinder-etc-snippets
{{- if $etcSources }}
projected:
sources:
{{ toYaml $etcSources | indent 14 }}
{{- else }}
emptyDir: {}
{{ end }}
{{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
# NOTE (portdirect): this will need to be set to a shared mount amongst all cinder
# pods for the coordination backend to be fully functional.

13
cinder/templates/deployment-backup.yaml
View File

@@ -22,6 +22,8 @@ limitations under the License.
{{- $serviceAccountName := "cinder-backup" }}
{{ tuple $envAll "backup" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $etcSources := .Values.pod.etcSources.cinder_backup }}
---
apiVersion: apps/v1
kind: Deployment
@@ -178,6 +180,9 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
- name: cinder-etc-snippets
mountPath: /etc/cinder/cinder.conf.d/
readOnly: true
{{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
@@ -299,6 +304,14 @@ spec:
secret:
secretName: cinder-etc
defaultMode: 0444
- name: cinder-etc-snippets
{{- if $etcSources }}
projected:
sources:
{{ toYaml $etcSources | indent 14 }}
{{- else }}
emptyDir: {}
{{ end }}
- name: cinder-bin
configMap:
name: cinder-bin

13
cinder/templates/deployment-scheduler.yaml
View File

@@ -20,6 +20,8 @@ limitations under the License.
{{- $serviceAccountName := "cinder-scheduler" }}
{{ tuple $envAll "scheduler" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $etcSources := .Values.pod.etcSources.cinder_scheduler }}
---
apiVersion: apps/v1
kind: Deployment
@@ -94,6 +96,9 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
- name: cinder-etc-snippets
mountPath: /etc/cinder/cinder.conf.d/
readOnly: true
{{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
@@ -129,6 +134,14 @@ spec:
secret:
secretName: cinder-etc
defaultMode: 0444
- name: cinder-etc-snippets
{{- if $etcSources }}
projected:
sources:
{{ toYaml $etcSources | indent 14 }}
{{- else }}
emptyDir: {}
{{ end }}
{{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
# NOTE (portdirect): this will need to be set to a shared mount amongst all cinder
# pods for the coordination backend to be fully functional.

13
cinder/templates/deployment-volume.yaml
View File

@@ -22,6 +22,8 @@ limitations under the License.
{{- $serviceAccountName := "cinder-volume" }}
{{ tuple $envAll "volume" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $etcSources := .Values.pod.etcSources.cinder_volume }}
---
apiVersion: apps/v1
kind: Deployment
@@ -176,6 +178,9 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
- name: cinder-etc-snippets
mountPath: /etc/cinder/cinder.conf.d/
readOnly: true
{{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
@@ -305,6 +310,14 @@ spec:
secret:
secretName: cinder-etc
defaultMode: 0444
- name: cinder-etc-snippets
{{- if $etcSources }}
projected:
sources:
{{ toYaml $etcSources | indent 14 }}
{{- else }}
emptyDir: {}
{{ end }}
- name: pod-shared
emptyDir: {}
- name: cinder-conversion

10
cinder/values.yaml
View File

@@ -256,6 +256,16 @@ pod:
cinder_db_sync:
volumeMounts:
volumes:
# -- This allows users to add Kubernetes Projected Volumes to be mounted at /etc/cinder/cinder.conf.d/
## This is a list of projected volume source objects for each deployment/statefulset/daemonset/cronjob
## https://kubernetes.io/docs/concepts/storage/projected-volumes/
etcSources:
cinder_api: []
cinder_scheduler: []
cinder_volume: []
cinder_volume_usage_audit: []
cinder_db_purge: []
cinder_backup: []
replicas:
api: 1
volume: 1

7
releasenotes/notes/cinder-aca94f2247bcddcd.yaml Normal file
View File

@@ -0,0 +1,7 @@
---
cinder:
- |
Allow users to add additional sources to the Projected Volume that is mounted
at /etc/cinder/cinder.conf.d/ so they may more easily override configs or provide
additional configs for the various services in the chart.
...