Merge "Add the conditional statement for log_config_append"
This commit is contained in:
commit
c07ddc2c71
@ -14,7 +14,7 @@ apiVersion: v1
|
||||
appVersion: v1.0.0
|
||||
description: OpenStack-Helm Nova
|
||||
name: nova
|
||||
version: 0.3.29
|
||||
version: 0.3.30
|
||||
home: https://docs.openstack.org/nova/latest/
|
||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
|
||||
sources:
|
||||
|
@ -20,7 +20,6 @@ limitations under the License.
|
||||
{{- $configMapBin := printf "%s-%s" $serviceName "bin" -}}
|
||||
{{- $configMapEtc := printf "%s-%s" $serviceName "etc" -}}
|
||||
{{- $configFile := printf "/etc/%s/%s.conf" $serviceName $serviceName -}}
|
||||
{{- $logConfigFile := $envAll.Values.conf.nova.DEFAULT.log_config_append -}}
|
||||
{{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}}
|
||||
{{- $serviceAccountName := printf "%s-%s" $serviceName "bootstrap" -}}
|
||||
{{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||
@ -97,10 +96,12 @@ spec:
|
||||
mountPath: {{ $configFile | quote }}
|
||||
subPath: {{ base $configFile | quote }}
|
||||
readOnly: true
|
||||
{{- if .Values.conf.nova.DEFAULT.log_config_append }}
|
||||
- name: bootstrap-conf
|
||||
mountPath: {{ $logConfigFile | quote }}
|
||||
subPath: {{ base $logConfigFile | quote }}
|
||||
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append | quote }}
|
||||
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append | quote }}
|
||||
readOnly: true
|
||||
{{- end }}
|
||||
{{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.compute.osapi.internal | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
|
||||
volumes:
|
||||
- name: pod-tmp
|
||||
|
@ -98,4 +98,5 @@ nova:
|
||||
- 0.3.27 Add 2023.2 Ubuntu Jammy overrides
|
||||
- 0.3.28 Add ability to define extra command(s) for the nova cell setup job
|
||||
- 0.3.29 Add ability to define extra command(s) for the nova service cleaner job
|
||||
- 0.3.30 Add the conditional statement for log_config_append
|
||||
...
|
||||
|
Loading…
Reference in New Issue
Block a user