From 429bc7aeccc9925567c022f9fe5baa4a6f2898b8 Mon Sep 17 00:00:00 2001
From: Michel Zanini <michel.zanini@travelport.com>
Date: Thu, 21 Jul 2022 14:03:35 -0300
Subject: [PATCH 1/2] feat: Add support to configure dnsPolicy on the Helm
 chart deployment

---
 charts/external-dns/CHANGELOG.md              | 3 +++
 charts/external-dns/templates/deployment.yaml | 3 +++
 charts/external-dns/values.yaml               | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/charts/external-dns/CHANGELOG.md b/charts/external-dns/CHANGELOG.md
index 98545c62df..b4129ce940 100644
--- a/charts/external-dns/CHANGELOG.md
+++ b/charts/external-dns/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- ## [UNRELEASED]
 ### Added
+
+- Add support to configure dnsPolicy on the Helm chart deployment. [@michelzanini](https://github.com/michelzanini)
+
 ### Changed
 ### Fixed
 ### Deprecated
diff --git a/charts/external-dns/templates/deployment.yaml b/charts/external-dns/templates/deployment.yaml
index fc162e3487..02ccee122e 100644
--- a/charts/external-dns/templates/deployment.yaml
+++ b/charts/external-dns/templates/deployment.yaml
@@ -44,6 +44,9 @@ spec:
       {{- with .Values.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ . }}
       {{- end }}
+      {{- if .Values.dnsPolicy }}
+      dnsPolicy: {{ .Values.dnsPolicy }}
+      {{- end }}
       containers:
         - name: external-dns
           {{- with .Values.securityContext }}
diff --git a/charts/external-dns/values.yaml b/charts/external-dns/values.yaml
index 8614e96d7c..0b985077f9 100644
--- a/charts/external-dns/values.yaml
+++ b/charts/external-dns/values.yaml
@@ -49,6 +49,10 @@ securityContext:
   capabilities:
     drop: ["ALL"]
 
+# Defaults to `ClusterFirst`.
+# Valid values are: `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`.
+dnsPolicy: ClusterFirst
+
 priorityClassName: ""
 
 terminationGracePeriodSeconds:

From ee32d06406556ec48b5cef8eb5c96bf7eb4f3c23 Mon Sep 17 00:00:00 2001
From: Michel Zanini <michel.zanini@travelport.com>
Date: Fri, 22 Jul 2022 07:07:01 -0300
Subject: [PATCH 2/2] Code review improvements for dnsPolicy configuration

---
 charts/external-dns/templates/deployment.yaml | 4 ++--
 charts/external-dns/values.yaml               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/external-dns/templates/deployment.yaml b/charts/external-dns/templates/deployment.yaml
index 02ccee122e..4dbbdb8f2a 100644
--- a/charts/external-dns/templates/deployment.yaml
+++ b/charts/external-dns/templates/deployment.yaml
@@ -44,8 +44,8 @@ spec:
       {{- with .Values.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ . }}
       {{- end }}
-      {{- if .Values.dnsPolicy }}
-      dnsPolicy: {{ .Values.dnsPolicy }}
+      {{- with .Values.dnsPolicy }}
+      dnsPolicy: {{ . }}
       {{- end }}
       containers:
         - name: external-dns
diff --git a/charts/external-dns/values.yaml b/charts/external-dns/values.yaml
index 0b985077f9..a9b3b59e88 100644
--- a/charts/external-dns/values.yaml
+++ b/charts/external-dns/values.yaml
@@ -51,7 +51,7 @@ securityContext:
 
 # Defaults to `ClusterFirst`.
 # Valid values are: `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`.
-dnsPolicy: ClusterFirst
+dnsPolicy:
 
 priorityClassName: ""