Maksytka/kind
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kind.git synced 2025-12-01 07:26:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

Do it in post

Browse Source
This commit is contained in:
John Howard
2023-02-15 07:55:37 -08:00
parent 33c4eaf560
commit 1964100d41
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
images/base/files/usr/local/bin/entrypoint
View File

@@ -417,7 +417,20 @@ enable_network_magic(){
# now we can ensure that DNS is configured to use our IP # now we can ensure that DNS is configured to use our IP
cp /etc/resolv.conf /etc/resolv.conf.original cp /etc/resolv.conf /etc/resolv.conf.original
sed -e "s/${docker_embedded_dns_ip}/${docker_host_ip}/g" /etc/resolv.conf.original >/etc/resolv.conf replaced="$(sed -e "s/${docker_embedded_dns_ip}/${docker_host_ip}/g" /etc/resolv.conf.original)"
if [[ "${KIND_DNS_SEARCH+x}" == "" ]]; then
# No DNS search set, just pass through as is
echo "$replaced" >/etc/resolv.conf
elif [[ -z "$KIND_DNS_SEARCH" ]]; then
# Empty search - remove all current search clauses
echo "$replaced" | grep -v "^search" >/etc/resolv.conf
else
# Search set - remove all current search clauses, and add the configured search
{
echo "search $KIND_DNS_SEARCH";
echo "$replaced" | grep -v "^search";
} >/etc/resolv.conf
fi
local files_to_update=( local files_to_update=(
/etc/kubernetes/manifests/etcd.yaml /etc/kubernetes/manifests/etcd.yaml

13
pkg/cluster/internal/providers/docker/provision.go
View File

@@ -201,18 +201,7 @@ func commonArgs(cluster string, cfg *config.Cluster, networkName string, nodeNam
} }
if cfg.Networking.DNSSearch != nil { if cfg.Networking.DNSSearch != nil {
if len(*cfg.Networking.DNSSearch) == 0 { args = append(args, "-e", "KIND_DNS_SEARCH="+strings.Join(*cfg.Networking.DNSSearch, " "))
return nil, errors.New("docker provider requires a non-empty dnsSearch")
}
for _, s := range *cfg.Networking.DNSSearch {
args = append(args, "--dns-search", s)
}
args = append(args, "--dns", "8.8.8.8")
args = append(args, "--dns", "8.8.4.4")
if config.ClusterHasIPv6(cfg) {
args = append(args, "--dns", "2001:4860:4860::8888")
args = append(args, "--dns", "2001:4860:4860::8844")
}
} }
return args, nil return args, nil

7
pkg/cluster/internal/providers/podman/provision.go
View File

@@ -165,12 +165,7 @@ func commonArgs(cfg *config.Cluster, networkName string, nodeNames []string) ([]
} }
if cfg.Networking.DNSSearch != nil { if cfg.Networking.DNSSearch != nil {
if len(*cfg.Networking.DNSSearch) == 0 { args = append(args, "-e", "KIND_DNS_SEARCH="+strings.Join(*cfg.Networking.DNSSearch, " "))
args = append(args, "--dns-search", "")
}
for _, s := range *cfg.Networking.DNSSearch {
args = append(args, "--dns-search", s)
}
} }
return args, nil return args, nil