From 3fee85324b51b21b48fc09b60a2eb11a9eef9f24 Mon Sep 17 00:00:00 2001
From: jinyuan <liujinyuan@inspur.com>
Date: Thu, 15 Apr 2021 16:07:32 +0800
Subject: [PATCH] Fix the problem in hostNetwork mode

If ClusterFirstWithHostNet does not exist, it will cause the communication between services to fail.

Change-Id: Iadac1d570e0aac1aee3361792319d825bcadc83c
---
 cinder/Chart.yaml                       | 2 +-
 cinder/templates/deployment-backup.yaml | 1 +
 cinder/templates/deployment-volume.yaml | 1 +
 releasenotes/notes/cinder.yaml          | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index 55df4145f6..62a53ed07e 100644
--- a/cinder/Chart.yaml
+++ b/cinder/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Cinder
 name: cinder
-version: 0.1.14
+version: 0.1.15
 home: https://docs.openstack.org/cinder/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
 sources:
diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml
index fb7806ae85..6fb482e51e 100755
--- a/cinder/templates/deployment-backup.yaml
+++ b/cinder/templates/deployment-backup.yaml
@@ -55,6 +55,7 @@ spec:
         {{ .Values.labels.backup.node_selector_key }}: {{ .Values.labels.backup.node_selector_value }}
 {{- if .Values.pod.useHostNetwork.backup }}
       hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet
 {{- end }}
 {{- if .Values.conf.enable_iscsi }}
       hostIPC: true
diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml
index 13cc46953b..ecc6c6115a 100755
--- a/cinder/templates/deployment-volume.yaml
+++ b/cinder/templates/deployment-volume.yaml
@@ -55,6 +55,7 @@ spec:
         {{ .Values.labels.volume.node_selector_key }}: {{ .Values.labels.volume.node_selector_value }}
 {{- if .Values.pod.useHostNetwork.volume }}
       hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet
 {{- end }}
 {{- if .Values.conf.enable_iscsi }}
       hostIPC: true
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index bfcca28f52..6e0de1c531 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/releasenotes/notes/cinder.yaml
@@ -15,3 +15,4 @@ cinder:
   - 0.1.12 Update volume type creation bootstrap logic
   - 0.1.13 Add NFS cinder backup override
   - 0.1.14 Add Multipathd support for ISCSI backed volumes
+  - 0.1.15 Fix the problem in hostNetwork mode