From dfbd0b16b475a1fc360032438a3892f95ffa8465 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Fri, 24 Mar 2017 12:07:03 +0000 Subject: [PATCH 1/3] Flannel is not longer the only network addon that supports ARM --- docs/getting-started-guides/kubeadm.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/docs/getting-started-guides/kubeadm.md b/docs/getting-started-guides/kubeadm.md index b1abb4c1c1..a5dbf724f0 100644 --- a/docs/getting-started-guides/kubeadm.md +++ b/docs/getting-started-guides/kubeadm.md @@ -190,8 +190,6 @@ You can install a pod network add-on with the following command: Please refer to the specific add-on installation guide for exact details. You should only install one pod network per cluster. -If you are on another architecture than amd64, you should use the flannel overlay network as described in [the multi-platform section](#kubeadm-is-multi-platform) - NOTE: You can install **only one** pod network per cluster. Once a pod network has been installed, you can confirm that it is working by checking that the `kube-dns` pod is `Running` in the output of `kubectl get pods --all-namespaces`. @@ -348,14 +346,6 @@ kubeadm deb packages and binaries are built for amd64, arm and arm64, following deb-packages are released for ARM and ARM 64-bit, but not RPMs (yet, reach out if there's interest). -Currently, only the pod network flannel is working on multiple architectures. You can install it this way: - - # export ARCH=amd64 - # curl -sSL "https://github.com/coreos/flannel/blob/master/Documentation/kube-flannel.yml?raw=true" | sed "s/amd64/${ARCH}/g" | kubectl create -f - - -Replace `ARCH=amd64` with `ARCH=arm` or `ARCH=arm64` depending on the platform you're running on. -Note that the Raspberry Pi 3 is in ARM 32-bit mode, so for RPi 3 you should set `ARCH` to `arm`, not `arm64`. - ## Cloudprovider integrations (experimental) Enabling specific cloud providers is a common request, this currently requires manual configuration and is therefore not yet supported. If you wish to do so, From 2ed1a1351c0c88a63b6d50e1a5cca33034ca02b8 Mon Sep 17 00:00:00 2001 From: chenhuan12 Date: Fri, 24 Mar 2017 18:25:28 +0800 Subject: [PATCH 2/3] fix command kubectl get serviceAccounts output fix command kubectl get serviceAccounts output --- docs/user-guide/service-accounts.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user-guide/service-accounts.md b/docs/user-guide/service-accounts.md index 5fc2490297..44c5a3610e 100644 --- a/docs/user-guide/service-accounts.md +++ b/docs/user-guide/service-accounts.md @@ -41,8 +41,8 @@ You can list this and any other serviceAccount resources in the namespace with t ```shell $ kubectl get serviceAccounts -NAME SECRETS -default 1 +NAME SECRETS AGE +default 1 1d ``` You can create additional serviceAccounts like this: From 13fd2d0f511d566c31fd4252d0471d03bbd5587a Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Fri, 24 Mar 2017 22:29:08 +0800 Subject: [PATCH 3/3] change the link icon The link now is a page of kubernetes.io, not a github's .md file any more. So I think use the link page's title( Building High-Availability Clusters) is fine. "high-availability.md" may be the older edition's link icon. --- docs/concepts/overview/components.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/concepts/overview/components.md b/docs/concepts/overview/components.md index 280b9b1f2c..7ac01baa20 100644 --- a/docs/concepts/overview/components.md +++ b/docs/concepts/overview/components.md @@ -18,7 +18,7 @@ unsatisfied). In theory, Master components can be run on any node in the cluster. However, for simplicity, current set up scripts typically start all master components on the same VM, and does not run user containers on this VM. See -[high-availability.md](/docs/admin/high-availability) for an example multi-master-VM setup. +[Building High-Availability Clusters](/docs/admin/high-availability) for an example multi-master-VM setup. Even in the future, when Kubernetes is fully self-hosting, it will probably be wise to only allow master components to schedule on a subset of nodes, to limit @@ -29,7 +29,7 @@ node-compromising security exploit. [kube-apiserver](/docs/admin/kube-apiserver) exposes the Kubernetes API; it is the front-end for the Kubernetes control plane. It is designed to scale horizontally (i.e., one scales -it by running more of them-- [high-availability.md](/docs/admin/high-availability)). +it by running more of them-- [Building High-Availability Clusters](/docs/admin/high-availability)). ### etcd