diff --git a/octavia/Chart.yaml b/octavia/Chart.yaml index d3f3e8d0ab..174ec421b3 100644 --- a/octavia/Chart.yaml +++ b/octavia/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Octavia name: octavia -version: 0.2.2 +version: 0.2.3 home: https://docs.openstack.org/octavia/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png sources: diff --git a/octavia/templates/daemonset-health-manager.yaml b/octavia/templates/daemonset-health-manager.yaml index eb4d59de34..a355e86ed8 100644 --- a/octavia/templates/daemonset-health-manager.yaml +++ b/octavia/templates/daemonset-health-manager.yaml @@ -118,10 +118,12 @@ spec: mountPath: /etc/octavia/octavia.conf subPath: octavia.conf readOnly: true + {{- if .Values.conf.octavia.DEFAULT.log_config_append }} - name: octavia-etc mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }} readOnly: true + {{- end }} {{ if $mounts_octavia_health_manager.volumeMounts }}{{ toYaml $mounts_octavia_health_manager.volumeMounts | indent 12 }}{{ end }} volumes: - name: pod-etc-octavia diff --git a/octavia/templates/deployment-api.yaml b/octavia/templates/deployment-api.yaml index a2c96687d4..76f0d23fb3 100644 --- a/octavia/templates/deployment-api.yaml +++ b/octavia/templates/deployment-api.yaml @@ -85,10 +85,12 @@ spec: mountPath: /etc/octavia/octavia.conf subPath: octavia.conf readOnly: true + {{- if .Values.conf.octavia.DEFAULT.log_config_append }} - name: octavia-etc mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }} readOnly: true + {{- end }} {{ if $mounts_octavia_api.volumeMounts }}{{ toYaml $mounts_octavia_api.volumeMounts | indent 12 }}{{ end }} volumes: - name: pod-etc-octavia diff --git a/octavia/templates/deployment-housekeeping.yaml b/octavia/templates/deployment-housekeeping.yaml index fe713b5da7..39903b6bab 100644 --- a/octavia/templates/deployment-housekeeping.yaml +++ b/octavia/templates/deployment-housekeeping.yaml @@ -80,10 +80,12 @@ spec: mountPath: /etc/octavia/octavia.conf subPath: octavia.conf readOnly: true + {{- if .Values.conf.octavia.DEFAULT.log_config_append }} - name: octavia-etc mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }} readOnly: true + {{- end }} {{ if $mounts_octavia_housekeeping.volumeMounts }}{{ toYaml $mounts_octavia_housekeeping.volumeMounts | indent 12 }}{{ end }} volumes: - name: pod-etc-octavia diff --git a/octavia/templates/deployment-worker.yaml b/octavia/templates/deployment-worker.yaml index 583dbf4324..54cf68d7d0 100644 --- a/octavia/templates/deployment-worker.yaml +++ b/octavia/templates/deployment-worker.yaml @@ -80,10 +80,12 @@ spec: mountPath: /etc/octavia/octavia.conf subPath: octavia.conf readOnly: true + {{- if .Values.conf.octavia.DEFAULT.log_config_append }} - name: octavia-etc mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }} readOnly: true + {{- end }} {{ if $mounts_octavia_worker.volumeMounts }}{{ toYaml $mounts_octavia_worker.volumeMounts | indent 12 }}{{ end }} volumes: - name: pod-etc-octavia diff --git a/releasenotes/notes/octavia.yaml b/releasenotes/notes/octavia.yaml index 9b975084db..c721edfb55 100644 --- a/releasenotes/notes/octavia.yaml +++ b/releasenotes/notes/octavia.yaml @@ -6,4 +6,5 @@ octavia: - 0.2.0 Remove support for releases before T - 0.2.1 Fix dnsPolicy for housekeeping service - 0.2.2 Update htk requirements repo + - 0.2.3 Allow using log_config_append=null ...