From c316193a624e98c1ef4bba575088de0404989d92 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Mon, 5 Feb 2018 08:43:28 -0800 Subject: [PATCH] remove references to the term "master" --- docs/charts_tips_and_tricks.md | 2 +- docs/install_faq.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/charts_tips_and_tricks.md b/docs/charts_tips_and_tricks.md index 2b4caa83b..e77c86a9d 100644 --- a/docs/charts_tips_and_tricks.md +++ b/docs/charts_tips_and_tricks.md @@ -204,7 +204,7 @@ together in one GitHub repository. **Deis's [Workflow](https://github.com/deis/workflow/tree/master/charts/workflow):** This chart exposes the entire Deis PaaS system with one chart. But it's different -from the SAP chart in that this master chart is built from each component, and +from the SAP chart in that this umbrella chart is built from each component, and each component is tracked in a different Git repository. Check out the `requirements.yaml` file to see how this chart is composed by their CI/CD pipeline. diff --git a/docs/install_faq.md b/docs/install_faq.md index 4a344c2ee..ff9ee89e6 100644 --- a/docs/install_faq.md +++ b/docs/install_faq.md @@ -106,12 +106,12 @@ Error: Error forwarding ports: error upgrading connection: dial tcp: lookup kube A: We have seen this issue with Ubuntu and Kubeadm in multi-node clusters. The issue is that the nodes expect certain DNS records to be obtainable via global DNS. Until this is resolved upstream, you can work around the issue as -follows: +follows. On each of the control plane nodes: -1) Add entries to `/etc/hosts` on the master mapping your hostnames to their public IPs -2) Install `dnsmasq` on the master (e.g. `apt install -y dnsmasq`) -3) Kill the k8s api server container on master (kubelet will recreate it) -4) Then `systemctl restart docker` (or reboot the master) for it to pick up the /etc/resolv.conf changes +1) Add entries to `/etc/hosts`, mapping your hostnames to their public IPs +2) Install `dnsmasq` (e.g. `apt install -y dnsmasq`) +3) Remove the k8s api server container (kubelet will recreate it) +4) Then `systemctl restart docker` (or reboot the node) for it to pick up the /etc/resolv.conf changes See this issue for more information: https://github.com/kubernetes/helm/issues/1455