ironic: allow extra containers for the conductor

Add the ability to specify init and running containers for the conductor
pods.

Change-Id: I88657a8d656f0ef5da56f75fca637ca6938f99d8
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
This commit is contained in:
Doug Goldstein 2024-10-29 16:15:38 -05:00
parent 8e5ad85fd0
commit adb13709e3
No known key found for this signature in database
4 changed files with 14 additions and 1 deletions

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ironic description: OpenStack-Helm Ironic
name: ironic name: ironic
version: 0.2.18 version: 0.2.19
home: https://docs.openstack.org/ironic/latest/ home: https://docs.openstack.org/ironic/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png
sources: sources:

View File

@ -162,6 +162,9 @@ spec:
- name: pod-shared - name: pod-shared
mountPath: /tmp/pod-shared mountPath: /tmp/pod-shared
{{- end }} {{- end }}
{{- with .Values.conductor.initContainers }}
{{- tpl (toYaml .) $ | nindent 8 }}
{{- end }}
containers: containers:
- name: ironic-conductor - name: ironic-conductor
{{ tuple $envAll "ironic_conductor" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll "ironic_conductor" | include "helm-toolkit.snippets.image" | indent 10 }}
@ -251,6 +254,9 @@ spec:
mountPath: /var/lib/openstack-helm mountPath: /var/lib/openstack-helm
{{ if $mounts_ironic_conductor.volumeMounts }}{{ toYaml $mounts_ironic_conductor.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_ironic_conductor.volumeMounts }}{{ toYaml $mounts_ironic_conductor.volumeMounts | indent 12 }}{{ end }}
{{- end }} {{- end }}
{{- with .Values.conductor.extraContainers }}
{{- tpl (toYaml .) $ | nindent 8 }}
{{- end }}
volumes: volumes:
- name: pod-tmp - name: pod-tmp
emptyDir: {} emptyDir: {}

View File

@ -207,6 +207,12 @@ conf:
datefmt: "%Y-%m-%d %H:%M:%S" datefmt: "%Y-%m-%d %H:%M:%S"
conductor: conductor:
# -- Additional containers to add to the conductor pods
## Note: Supports use of custom Helm templates
extraContainers: []
# -- Additional init containers to add to the conductor pods
## Note: Supports use of custom Helm templates
initContainers: []
http: http:
enabled: true enabled: true
init_script: | init_script: |

View File

@ -22,4 +22,5 @@ ironic:
- 0.2.16 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default - 0.2.16 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
- 0.2.17 Allow overriding of hostNetwork and hostIPC for Ironic conductor - 0.2.17 Allow overriding of hostNetwork and hostIPC for Ironic conductor
- 0.2.18 Use service tokens - 0.2.18 Use service tokens
- 0.2.19 Allow extra containers for the conductor
... ...