From 1becb52cbb6c1f7f09a80d1b244ff7ca371057c0 Mon Sep 17 00:00:00 2001
From: Corey O'Brien <coreypobrien@gmail.com>
Date: Fri, 11 May 2018 04:20:54 -0400
Subject: [PATCH]  [stable/external-dns] Add option to set registry (#5138)

* Revert "Allow upgrade with empty clusterIP (#4711)"

This reverts commit 26289ca9452179a9e1e2058ba587ffef9955aa8c.

* [stable/external-dns] Add option to set registry
---
 stable/external-dns/Chart.yaml                | 2 +-
 stable/external-dns/README.md                 | 1 +
 stable/external-dns/templates/deployment.yaml | 1 +
 stable/external-dns/templates/service.yaml    | 2 ++
 stable/external-dns/values.yaml               | 3 +++
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/stable/external-dns/Chart.yaml b/stable/external-dns/Chart.yaml
index 19e9cce40b..99c6dbb5f6 100644
--- a/stable/external-dns/Chart.yaml
+++ b/stable/external-dns/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: Configure external DNS servers (AWS Route53, Google CloudDNS and others)
   for Kubernetes Ingresses and Services
 name: external-dns
-version: 0.5.5
+version: 0.6.0
 appVersion: 0.5.0
 home: https://github.com/kubernetes-incubator/external-dns
 sources:
diff --git a/stable/external-dns/README.md b/stable/external-dns/README.md
index e710c3e1d4..ad846f1f9c 100644
--- a/stable/external-dns/README.md
+++ b/stable/external-dns/README.md
@@ -48,6 +48,7 @@ The following table lists the configurable parameters of the external-dns chart
 | `publishInternalServices`          | Allow external-dns to publish DNS records for ClusterIP services (optional).                                               | `false`                                            |
 | `rbac.create`                      | If true, create & use RBAC resources                                                                                       | `false`                                            |
 | `rbac.serviceAccountName`          | Existing ServiceAccount to use (ignored if rbac.create=true)                                                               | `default`                                          |
+| `registry`                         | Registry method to use (options: txt, noop)                                                                                | `txt`                                              |
 | `resources`                        | CPU/Memory resource requests/limits.                                                                                       | `{}`                                               |
 | `service.annotations`              | Annotations to add to service                                                                                              | `{}`                                               |
 | `service.clusterIP`                | IP address to assign to service                                                                                            | `""`                                               |
diff --git a/stable/external-dns/templates/deployment.yaml b/stable/external-dns/templates/deployment.yaml
index c34535ceab..c4dab43fe2 100644
--- a/stable/external-dns/templates/deployment.yaml
+++ b/stable/external-dns/templates/deployment.yaml
@@ -35,6 +35,7 @@ spec:
           {{- end }}
             - --policy={{ .Values.policy }}
             - --provider={{ .Values.provider }}
+            - --registry={{ .Values.registry }}
           {{- if .Values.txtOwnerId }}
             - --txt-owner-id={{ .Values.txtOwnerId }}
           {{- end }}
diff --git a/stable/external-dns/templates/service.yaml b/stable/external-dns/templates/service.yaml
index c945e9f166..56694d10d5 100644
--- a/stable/external-dns/templates/service.yaml
+++ b/stable/external-dns/templates/service.yaml
@@ -12,7 +12,9 @@ metadata:
     release: {{ .Release.Name }}
   name: {{ template "external-dns.fullname" . }}
 spec:
+{{- if .Values.service.clusterIP }}
   clusterIP: "{{ .Values.service.clusterIP }}"
+{{- end }}
 {{- if .Values.service.externalIPs }}
   externalIPs:
 {{ toYaml .Values.service.externalIPs | indent 4 }}
diff --git a/stable/external-dns/values.yaml b/stable/external-dns/values.yaml
index d0db48da01..af06bb7c95 100755
--- a/stable/external-dns/values.yaml
+++ b/stable/external-dns/values.yaml
@@ -40,6 +40,9 @@ domainFilters: []
 # Filter sources managed by external-dns via annotation using label selector semantics (default: all sources)
 annotationFilter: ""
 
+# Registry to use for ownership (txt or noop)
+registry: "txt"
+
 # When using the TXT registry, a name that identifies this instance of ExternalDNS
 txtOwnerId: ""