Skip to content

Commit

Permalink
Stable/unbound/add tcp port + minor fixes (helm#5544)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
Markbnj authored and k8s-ci-robot committed May 18, 2018
1 parent 973b4fa commit b8e6f2d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion stable/unbound/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
20 changes: 12 additions & 8 deletions stable/unbound/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand All @@ -49,7 +54,6 @@ spec:
initialDelaySeconds: 5
timeoutSeconds: 2
readinessProbe:
exec:
httpGet:
path: "/healthz"
port: 8080
Expand All @@ -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 }}

4 changes: 4 additions & 0 deletions stable/unbound/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit b8e6f2d

Please sign in to comment.