From 154e50f13405d037acbcf91f5e8e32d63295b80d Mon Sep 17 00:00:00 2001
From: Rachid Zarouali <rachid.zarouali@sevensphere.io>
Date: Tue, 14 May 2024 08:35:59 +0200
Subject: [PATCH] add dnsPolicy feature to occm

---
 charts/openstack-cloud-controller-manager/Chart.yaml            | 2 +-
 .../openstack-cloud-controller-manager/templates/daemonset.yaml | 1 +
 charts/openstack-cloud-controller-manager/values.yaml           | 2 ++
 .../openstack-cloud-controller-manager-ds.yaml                  | 1 +
 .../openstack-cloud-controller-manager-pod.yaml                 | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/charts/openstack-cloud-controller-manager/Chart.yaml b/charts/openstack-cloud-controller-manager/Chart.yaml
index 26952f0fd3..3e457c796f 100644
--- a/charts/openstack-cloud-controller-manager/Chart.yaml
+++ b/charts/openstack-cloud-controller-manager/Chart.yaml
@@ -4,7 +4,7 @@ description: Openstack Cloud Controller Manager Helm Chart
 icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png
 home: https://github.com/kubernetes/cloud-provider-openstack
 name: openstack-cloud-controller-manager
-version: 2.30.0
+version: 2.30.1
 maintainers:
   - name: eumel8
     email: f.kloeker@telekom.de
diff --git a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml
index df14bd1665..875121eafb 100644
--- a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml
+++ b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml
@@ -107,6 +107,7 @@ spec:
       {{- if .Values.extraInitContainers }}
       initContainers: {{ toYaml .Values.extraInitContainers | nindent 6 }}
       {{- end }}
+      dnsPolicy: {{ .Values.dnsPolicy }}
       hostNetwork: true
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
diff --git a/charts/openstack-cloud-controller-manager/values.yaml b/charts/openstack-cloud-controller-manager/values.yaml
index f656d6bd10..3bf7bf78b0 100644
--- a/charts/openstack-cloud-controller-manager/values.yaml
+++ b/charts/openstack-cloud-controller-manager/values.yaml
@@ -46,6 +46,8 @@ livenessProbe: {}
 # Set readinessProbe in the same way like livenessProbe
 readinessProbe: {}
 
+dnsPolicy: ClusterFirstWithHostNet
+
 # Set nodeSelector where the controller should run, i.e. controlplane nodes
 nodeSelector:
   node-role.kubernetes.io/control-plane: ""
diff --git a/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml b/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml
index 004e95c6c2..230e575640 100644
--- a/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml
+++ b/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml
@@ -65,6 +65,7 @@ spec:
               value: /etc/config/cloud.conf
             - name: CLUSTER_NAME
               value: kubernetes
+      dnsPolicy: ClusterFirstWithHostNet
       hostNetwork: true
       volumes:
       - hostPath:
diff --git a/manifests/controller-manager/openstack-cloud-controller-manager-pod.yaml b/manifests/controller-manager/openstack-cloud-controller-manager-pod.yaml
index ccf59240a4..daf889ed09 100644
--- a/manifests/controller-manager/openstack-cloud-controller-manager-pod.yaml
+++ b/manifests/controller-manager/openstack-cloud-controller-manager-pod.yaml
@@ -38,6 +38,7 @@ spec:
           value: /etc/config/cloud.conf
         - name: CLUSTER_NAME
           value: kubernetes
+  dnsPolicy: ClusterFirstWithHostNet
   hostNetwork: true
   securityContext:
     runAsUser: 1001