Merge "ironic: allow overriding of hostNetwork and hostIPC for Ironic Conductor."

This commit is contained in:
Zuul 2024-07-18 21:51:35 +00:00 committed by Gerrit Code Review
commit 002c21ff25
4 changed files with 11 additions and 2 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.16 version: 0.2.17
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

@ -54,9 +54,13 @@ spec:
{{ end }} {{ end }}
securityContext: securityContext:
runAsUser: 0 runAsUser: 0
{{ if .Values.pod.useHostNetwork.conductor }}
hostNetwork: True hostNetwork: True
hostIPC: True
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
{{ end }}
{{ if .Values.pod.useHostIPC.conductor }}
hostIPC: True
{{ end }}
initContainers: initContainers:
{{ tuple $envAll "conductor" $mounts_ironic_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll "conductor" $mounts_ironic_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
{{- if $envAll.Values.conductor.pxe.enabled }} {{- if $envAll.Values.conductor.pxe.enabled }}

View File

@ -776,6 +776,10 @@ pod:
limits: limits:
memory: "1024Mi" memory: "1024Mi"
cpu: "2000m" cpu: "2000m"
useHostNetwork:
conductor: true
useHostIPC:
conductor: true
network_policy: network_policy:
ironic: ironic:

View File

@ -20,4 +20,5 @@ ironic:
- 0.2.14 Update images used by default - 0.2.14 Update images used by default
- 0.2.15 Allow enabling/disabling of conductor http and pxe containers and overriding their init and runtime scripts - 0.2.15 Allow enabling/disabling of conductor http and pxe containers and overriding their init and runtime scripts
- 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
... ...