Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Pod DNS settings #2116

Merged
merged 2 commits into from
Jun 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions chart/flux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions chart/flux/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 8 additions & 0 deletions chart/flux/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
8 changes: 8 additions & 0 deletions deploy/flux-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,11 @@ spec:
# Serve /metrics endpoint at different port;
# make sure to set prometheus' annotation to scrape the port value.
- --listen-metrics=:3031

# Optional DNS settings, configuring the ndots option may resolve
# nslookup issues on some Kubernetes setups.
# dnsPolicy: "None"
# dnsConfig:
# options:
# - name: ndots
# value: "1"