Add log_dir option for placement

Change-Id: I1741558be57b60cfb90f9b36e653c09756933d1e
This commit is contained in:
dengzhaosen 2023-12-18 11:02:47 +08:00
parent 65bd23fba8
commit 0be32dd415
3 changed files with 25 additions and 1 deletions

View File

@ -16,7 +16,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Placement description: OpenStack-Helm Placement
name: placement name: placement
version: 0.3.9 version: 0.3.10
home: https://docs.openstack.org/placement/latest/ home: https://docs.openstack.org/placement/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png
sources: sources:

View File

@ -59,6 +59,19 @@ spec:
terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }}
initContainers: initContainers:
{{ tuple $envAll "api" $mounts_placement_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll "api" $mounts_placement_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
{{- if .Values.conf.placement.DEFAULT.log_dir }}
- name: placement-api-init-log
{{ tuple $envAll "placement" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ dict "envAll" $envAll "application" "placement" "container" "placement_api" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
command:
- chown
- -R
- "placement:"
- {{ .Values.conf.placement.DEFAULT.log_dir }}
volumeMounts:
- name: log
mountPath: {{ .Values.conf.placement.DEFAULT.log_dir }}
{{- end }}
containers: containers:
- name: placement-api - name: placement-api
{{ tuple $envAll "placement" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll "placement" | include "helm-toolkit.snippets.image" | indent 10 }}
@ -122,6 +135,10 @@ spec:
mountPath: /etc/apache2/conf-enabled/wsgi-placement.conf mountPath: /etc/apache2/conf-enabled/wsgi-placement.conf
subPath: wsgi-placement.conf subPath: wsgi-placement.conf
readOnly: true readOnly: true
{{- if .Values.conf.placement.DEFAULT.log_dir }}
- name: log
mountPath: {{ .Values.conf.placement.DEFAULT.log_dir }}
{{- end }}
{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }} {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
{{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.placement.api.internal "path" "/etc/placement/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }} {{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.placement.api.internal "path" "/etc/placement/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
{{ if $mounts_placement.volumeMounts }}{{ toYaml $mounts_placement.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_placement.volumeMounts }}{{ toYaml $mounts_placement.volumeMounts | indent 12 }}{{ end }}
@ -138,6 +155,12 @@ spec:
secret: secret:
secretName: placement-etc secretName: placement-etc
defaultMode: 0444 defaultMode: 0444
{{- if .Values.conf.placement.DEFAULT.log_dir }}
- name: log
hostPath:
path: {{ .Values.conf.placement.DEFAULT.log_dir }}
type: DirectoryOrCreate
{{- end }}
{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
{{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.placement.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.placement.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
{{ if $mounts_placement.volumes }}{{ toYaml $mounts_placement.volumes | indent 8 }}{{ end }} {{ if $mounts_placement.volumes }}{{ toYaml $mounts_placement.volumes | indent 8 }}{{ end }}

View File

@ -32,4 +32,5 @@ placement:
- 0.3.7 Use service tokens - 0.3.7 Use service tokens
- 0.3.8 Add Ubuntu Jammy overrides - 0.3.8 Add Ubuntu Jammy overrides
- 0.3.9 Add 2023.2 Ubuntu Jammy overrides - 0.3.9 Add 2023.2 Ubuntu Jammy overrides
- 0.3.10 Add log_dir option for placement
... ...