Incorporate pod DNS settings into chart

Mainly to provide people with the tools to overcome nslookup issues on certain Kubernetes setups, as one solution seems to be to configure the ndots value to "1". Ref: #2051 (comment)
fluxcd · May 31, 2019 · 2b53dae · 2b53dae
1 parent e81b697
commit 2b53dae
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/chart/flux/README.md b/chart/flux/README.md
@@ -194,6 +194,10 @@ The following tables lists the configurable parameters of the Weave Flux chart a
 | `nodeSelector`                                    | `{}`                                                 | Node Selector properties for the Flux deployment
 | `tolerations`                                     | `[]`                                                 | Tolerations properties for the Flux deployment
 | `affinity`                                        | `{}`                                                 | Affinity properties for the Flux deployment
+| `extraVolumeMounts`                               | `[]`                                                 | Extra volumes mounts
+| `extraVolumes`                                    | `[]`                                                 | Extra volumes
+| `dnsPolicy`                                       | ``                                                   | Pod DNS policy
+| `dnsConfig`                                       | ``                                                   | Pod DNS config
 | `token`                                           | `None`                                               | Weave Cloud service token
 | `extraEnvs`                                       | `[]`                                                 | Extra environment variables for the Flux pod(s)
 | `rbac.create`                                     | `true`                                               | If `true`, create and use RBAC resources

diff --git a/chart/flux/templates/deployment.yaml b/chart/flux/templates/deployment.yaml
@@ -218,6 +218,13 @@ spec:
 {{ toYaml .Values.additionalArgs | indent 10 }}
           {{- end }}
           resources:
+{{- if .Values.dnsPolicy }}
+      dnsPolicy: {{ .Values.dnsPolicy }}
+{{- end }}
+{{- if .Values.dnsConfig }}
+      dnsConfig:
+{{ toYaml .Values.dnsConfig | indent 8 }}
+{{- end }}
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
@@ -104,6 +104,14 @@ extraVolumeMounts: []
 
 extraVolumes: []
 
+# Optional DNS settings, configuring the ndots option may resolve
+# nslookup issues on some Kubernetes setups.
+#dnsPolicy: "None"
+#dnsConfig:
+#  options:
+#    - name: ndots
+#      value: "1"
+
 gpgKeys:
   # These keys will be imported into GPG in the Flux container.
   secretName: ""