Skip to content

Commit 12775e9

Browse files
authored
Merge pull request #2968 from k8s-infra-cherrypick-robot/cherry-pick-2966-to-release-1.6
[release-1.6] Remove listen-client-urls hack from dual-stack templates
2 parents 87d4fd2 + 8903f5b commit 12775e9

File tree

4 files changed

+0
-8
lines changed

4 files changed

+0
-8
lines changed

docs/book/src/topics/ipv6.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ The reference [ipv6 flavor](https://raw.githubusercontent.com/kubernetes-sigs/cl
121121
122122
- Kubernetes version needs to be 1.18+
123123
124-
- etcd needs to listen on 127.0.0.1:2379 in addition to IPv6 IPs to resolve an issue with the etcd health check as the dial transport is only doing IPv4. This is done by modifying the `listen-client-urls` etcd arg in postKubeadmCommands as follows:
125-
```yaml
126-
- sed -i '\#--listen-client-urls#s#$#,https://127.0.0.1:2379#' /etc/kubernetes/manifests/etcd.yaml
127-
```
128-
129124
- The :53 port needs to be free on the host so coredns can use it. In 18.04, systemd-resolved uses the port :53 on the host and is used by default for DNS. This causes the coredns pods to crash for single stack IPv6 with bind address already in use as coredns pods are run on hostNetwork to leverage the host routes for DNS resolution. This is done by running the following commands in postKubeadmCommands:
130125
```yaml
131126
- echo "DNSStubListener=no" >> /etc/systemd/resolved.conf

templates/cluster-template-dual-stack.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/flavors/dual-stack/patches/kubeadm-controlplane.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ metadata:
55
spec:
66
kubeadmConfigSpec:
77
postKubeadmCommands:
8-
- sed -i '\#--listen-client-urls#s#$#,https://127.0.0.1:2379#' /etc/kubernetes/manifests/etcd.yaml
98
# This frees up :53 on the host for the coredns pods
109
- echo "DNSStubListener=no" >> /etc/systemd/resolved.conf
1110
- mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf

templates/test/ci/cluster-template-prow-dual-stack.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)