openstack/openstack-helm
Code Issues Proposed changes

Merge "octavia: allow using log_config_append=null"

Browse Source
This commit is contained in:
Zuul 2021-11-16 22:00:25 +00:00 committed by Gerrit Code Review
commit 5640d16e32
6 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/Chart.yaml
View File

@ -16,7 +16,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Octavia description: OpenStack-Helm Octavia
name: octavia name: octavia
version: 0.2.2 version: 0.2.3
home: https://docs.openstack.org/octavia/latest/ home: https://docs.openstack.org/octavia/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png
sources: sources:

2
octavia/templates/daemonset-health-manager.yaml
View File

@ -118,10 +118,12 @@ spec:
mountPath: /etc/octavia/octavia.conf mountPath: /etc/octavia/octavia.conf
subPath: octavia.conf subPath: octavia.conf
readOnly: true readOnly: true
{{- if .Values.conf.octavia.DEFAULT.log_config_append }}
- name: octavia-etc - name: octavia-etc
mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }} mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }}
readOnly: true readOnly: true
{{- end }}
{{ if $mounts_octavia_health_manager.volumeMounts }}{{ toYaml $mounts_octavia_health_manager.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_octavia_health_manager.volumeMounts }}{{ toYaml $mounts_octavia_health_manager.volumeMounts | indent 12 }}{{ end }}
volumes: volumes:
- name: pod-etc-octavia - name: pod-etc-octavia

2
octavia/templates/deployment-api.yaml
View File

@ -85,10 +85,12 @@ spec:
mountPath: /etc/octavia/octavia.conf mountPath: /etc/octavia/octavia.conf
subPath: octavia.conf subPath: octavia.conf
readOnly: true readOnly: true
{{- if .Values.conf.octavia.DEFAULT.log_config_append }}
- name: octavia-etc - name: octavia-etc
mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }} mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }}
readOnly: true readOnly: true
{{- end }}
{{ if $mounts_octavia_api.volumeMounts }}{{ toYaml $mounts_octavia_api.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_octavia_api.volumeMounts }}{{ toYaml $mounts_octavia_api.volumeMounts | indent 12 }}{{ end }}
volumes: volumes:
- name: pod-etc-octavia - name: pod-etc-octavia

2
octavia/templates/deployment-housekeeping.yaml
View File

@ -80,10 +80,12 @@ spec:
mountPath: /etc/octavia/octavia.conf mountPath: /etc/octavia/octavia.conf
subPath: octavia.conf subPath: octavia.conf
readOnly: true readOnly: true
{{- if .Values.conf.octavia.DEFAULT.log_config_append }}
- name: octavia-etc - name: octavia-etc
mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }} mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }}
readOnly: true readOnly: true
{{- end }}
{{ if $mounts_octavia_housekeeping.volumeMounts }}{{ toYaml $mounts_octavia_housekeeping.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_octavia_housekeeping.volumeMounts }}{{ toYaml $mounts_octavia_housekeeping.volumeMounts | indent 12 }}{{ end }}
volumes: volumes:
- name: pod-etc-octavia - name: pod-etc-octavia

2
octavia/templates/deployment-worker.yaml
View File

@ -80,10 +80,12 @@ spec:
mountPath: /etc/octavia/octavia.conf mountPath: /etc/octavia/octavia.conf
subPath: octavia.conf subPath: octavia.conf
readOnly: true readOnly: true
{{- if .Values.conf.octavia.DEFAULT.log_config_append }}
- name: octavia-etc - name: octavia-etc
mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }} mountPath: {{ .Values.conf.octavia.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.octavia.DEFAULT.log_config_append }}
readOnly: true readOnly: true
{{- end }}
{{ if $mounts_octavia_worker.volumeMounts }}{{ toYaml $mounts_octavia_worker.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_octavia_worker.volumeMounts }}{{ toYaml $mounts_octavia_worker.volumeMounts | indent 12 }}{{ end }}
volumes: volumes:
- name: pod-etc-octavia - name: pod-etc-octavia

1
releasenotes/notes/octavia.yaml
View File

@ -6,4 +6,5 @@ octavia:
- 0.2.0 Remove support for releases before T - 0.2.0 Remove support for releases before T
- 0.2.1 Fix dnsPolicy for housekeeping service - 0.2.1 Fix dnsPolicy for housekeeping service
- 0.2.2 Update htk requirements repo - 0.2.2 Update htk requirements repo
- 0.2.3 Allow using log_config_append=null
... ...