From 049e679939fbd3b0c659dd0977911b8dc3b5a015 Mon Sep 17 00:00:00 2001
From: Andrew Harris <andrew.harris@rackspace.com>
Date: Mon, 15 Jul 2024 17:47:02 -0400
Subject: [PATCH] ironic: allow overriding of hostNetwork and hostIPC for
 Ironic Conductor.

Change-Id: Ifc0ac42bd51e727e26cf849be4a118527a528ad7
---
 ironic/Chart.yaml                           | 2 +-
 ironic/templates/statefulset-conductor.yaml | 6 +++++-
 ironic/values.yaml                          | 4 ++++
 releasenotes/notes/ironic.yaml              | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml
index dbc947d71c..24b7c81f31 100644
--- a/ironic/Chart.yaml
+++ b/ironic/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ironic
 name: ironic
-version: 0.2.16
+version: 0.2.17
 home: https://docs.openstack.org/ironic/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png
 sources:
diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml
index cb46b9edfb..bcf6238c76 100644
--- a/ironic/templates/statefulset-conductor.yaml
+++ b/ironic/templates/statefulset-conductor.yaml
@@ -54,9 +54,13 @@ spec:
 {{ end }}
       securityContext:
         runAsUser: 0
+{{ if .Values.pod.useHostNetwork.conductor }}
       hostNetwork: True
-      hostIPC: True
       dnsPolicy: ClusterFirstWithHostNet
+{{ end }}
+{{ if .Values.pod.useHostIPC.conductor }}
+      hostIPC: True
+{{ end }}
       initContainers:
 {{ tuple $envAll "conductor" $mounts_ironic_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
 {{- if $envAll.Values.conductor.pxe.enabled }}
diff --git a/ironic/values.yaml b/ironic/values.yaml
index 17c05cc4fe..2e6e5ff0f2 100644
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@@ -776,6 +776,10 @@ pod:
         limits:
           memory: "1024Mi"
           cpu: "2000m"
+  useHostNetwork:
+    conductor: true
+  useHostIPC:
+    conductor: true
 
 network_policy:
   ironic:
diff --git a/releasenotes/notes/ironic.yaml b/releasenotes/notes/ironic.yaml
index 1a3d7ddf02..4358279a30 100644
--- a/releasenotes/notes/ironic.yaml
+++ b/releasenotes/notes/ironic.yaml
@@ -20,4 +20,5 @@ ironic:
   - 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.16 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
+  - 0.2.17 Allow overriding of hostNetwork and hostIPC for Ironic conductor
 ...