mirror of https://github.com/k3s-io/k3s
d731dc7546
Automatic merge from submit-queue (batch tested with PRs 41826, 42405)
Add stubDomains and upstreamNameservers configuration to kube-dns
```release-note
Updates the dnsmasq cache/mux layer to be managed by dnsmasq-nanny.
dnsmasq-nanny manages dnsmasq based on values from the
kube-system:kube-dns configmap:
"stubDomains": {
"acme.local": ["1.2.3.4"]
},
is a map of domain to list of nameservers for the domain. This is used
to inject private DNS domains into the kube-dns namespace. In the above
example, any DNS requests for *.acme.local will be served by the
nameserver 1.2.3.4.
"upstreamNameservers": ["8.8.8.8", "8.8.4.4"]
is a list of upstreamNameservers to use, overriding the configuration
specified in /etc/resolv.conf.
```
|
||
|---|---|---|
| .. | ||
| addons | ||
| aws | ||
| centos | ||
| gce | ||
| gke | ||
| images | ||
| juju | ||
| kubemark | ||
| lib | ||
| libvirt-coreos | ||
| local | ||
| openstack-heat | ||
| ovirt | ||
| photon-controller | ||
| rackspace | ||
| saltbase | ||
| skeleton | ||
| ubuntu | ||
| vagrant | ||
| vsphere | ||
| windows | ||
| BUILD | ||
| OWNERS | ||
| README.md | ||
| clientbin.sh | ||
| common.sh | ||
| get-kube-binaries.sh | ||
| get-kube-local.sh | ||
| get-kube.sh | ||
| kube-down.sh | ||
| kube-push.sh | ||
| kube-up.sh | ||
| kube-util.sh | ||
| kubeadm.sh | ||
| kubectl.sh | ||
| log-dump.sh | ||
| options.md | ||
| restore-from-backup.sh | ||
| test-e2e.sh | ||
| test-network.sh | ||
| test-smoke.sh | ||
| update-storage-objects.sh | ||
| validate-cluster.sh | ||
README.md
Cluster Configuration
Deprecation Notice: This directory has entered maintenance mode and will not be accepting new providers. Please submit new automation deployments to kube-deploy. Deployments in this directory will continue to be maintained and supported at their current level of support.
The scripts and data in this directory automate creation and configuration of a Kubernetes cluster, including networking, DNS, nodes, and master components.
See the getting-started guides for examples of how to use the scripts.
cloudprovider/config-default.sh contains a set of tweakable definitions/parameters for the cluster.
The heavy lifting of configuring the VMs is done by SaltStack.