From b8e6f2db5ffcaf5319452f1a6fe8da5709aee2c6 Mon Sep 17 00:00:00 2001
From: Mark Betz <Markbnj@users.noreply.github.com>
Date: Fri, 18 May 2018 02:40:01 -0400
Subject: [PATCH] Stable/unbound/add tcp port + minor fixes (#5544)

* Add the tcp port definition to the unbound container

* Add the tcp port definition to the unbound service

* Wrap resources in with block to prevent rendering when empty

* Style: unindent remaining with blocks to left margin

* Bump chart version.
---
 stable/unbound/Chart.yaml                |  2 +-
 stable/unbound/templates/deployment.yaml | 20 ++++++++++++--------
 stable/unbound/templates/service.yaml    |  4 ++++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/stable/unbound/Chart.yaml b/stable/unbound/Chart.yaml
index 8822619507..a33d81b95e 100644
--- a/stable/unbound/Chart.yaml
+++ b/stable/unbound/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: Unbound is a fast caching DNS resolver
 home: https://www.unbound.net/
 name: unbound
-version: 0.1.1
+version: 0.1.2
 appVersion: 1.6.7
 sources:
 - http://unbound.nlnetlabs.nl/svn/
diff --git a/stable/unbound/templates/deployment.yaml b/stable/unbound/templates/deployment.yaml
index f95e93774d..488208dd13 100644
--- a/stable/unbound/templates/deployment.yaml
+++ b/stable/unbound/templates/deployment.yaml
@@ -32,12 +32,17 @@ spec:
       - name: "unbound"
         image: {{ .Values.unbound.image.repository }}:{{ .Values.unbound.image.tag }}
         imagePullPolicy: {{ .Values.unbound.image.pullPolicy | quote }}
+{{- with .Values.resources }}
         resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ toYaml . | indent 10 }}
+{{- end }}
         ports:
         - name: "dns-udp"
           containerPort: {{ .Values.unbound.serverPort }}
           protocol: "UDP"
+        - name: "dns-tcp"
+          containerPort: {{ .Values.unbound.serverPort }}
+          protocol: "TCP"
         volumeMounts:
         - name: "unbound-conf"
           mountPath: "/etc/unbound/"
@@ -49,7 +54,6 @@ spec:
           initialDelaySeconds: 5
           timeoutSeconds: 2
         readinessProbe:
-          exec:
           httpGet:
             path: "/healthz"
             port: 8080
@@ -68,16 +72,16 @@ spec:
       - name: "unbound-conf"
         configMap:
           name: {{ template "unbound.fullname" . }}
-    {{- with .Values.nodeSelector }}
+{{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
+{{- end }}
+{{- with .Values.affinity }}
       affinity:
 {{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
+{{- end }}
+{{- with .Values.tolerations }}
       tolerations:
 {{ toYaml . | indent 8 }}
-    {{- end }}
+{{- end }}
 
diff --git a/stable/unbound/templates/service.yaml b/stable/unbound/templates/service.yaml
index 8bdc18671d..865646cfb1 100644
--- a/stable/unbound/templates/service.yaml
+++ b/stable/unbound/templates/service.yaml
@@ -16,3 +16,7 @@ spec:
     protocol: UDP
     port: {{ .Values.unbound.serverPort }}
     targetPort: dns-udp
+  - name: dns-tcp
+    protocol: TCP
+    port: {{ .Values.unbound.serverPort }}
+    targetPort: dns-tcp