From 88b4eeca2bf3d7249f9fa7a13fa6961f21ca5b9a Mon Sep 17 00:00:00 2001 From: Stewart-YU Date: Fri, 22 Sep 2017 06:01:45 +0800 Subject: [PATCH] Update create-cluster-kubeadm.md (#5369) * Update fedora_ansible_config.md Fix format. * Update create-cluster-kubeadm.md Fix format: add a blank line. * Update vsphere.md Fix leading spaces in commands. * Update fedora_ansible_config.md again --- .../fedora/fedora_ansible_config.md | 2 +- docs/getting-started-guides/vsphere.md | 14 +++++++------- docs/setup/independent/create-cluster-kubeadm.md | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/docs/getting-started-guides/fedora/fedora_ansible_config.md b/docs/getting-started-guides/fedora/fedora_ansible_config.md index d6399f1b3f..f87a697893 100644 --- a/docs/getting-started-guides/fedora/fedora_ansible_config.md +++ b/docs/getting-started-guides/fedora/fedora_ansible_config.md @@ -69,7 +69,7 @@ If you already are running on a machine which has passwordless ssh access to the *Otherwise* setup ssh on the machines like so (you will need to know the root password to all machines in the cluster). -edit: ~/contrib/ansible/inventory/group_vars/all.yml +edit: `~/contrib/ansible/inventory/group_vars/all.yml` ```yaml ansible_ssh_user: root diff --git a/docs/getting-started-guides/vsphere.md b/docs/getting-started-guides/vsphere.md index cc62a8e215..1f8e642fdd 100644 --- a/docs/getting-started-guides/vsphere.md +++ b/docs/getting-started-guides/vsphere.md @@ -56,18 +56,18 @@ For each of the virtual machine nodes that will be participating in the cluster, * Set up GOVC environment - export GOVC_URL='vCenter IP OR FQDN' - export GOVC_USERNAME='vCenter User' - export GOVC_PASSWORD='vCenter Password' - export GOVC_INSECURE=1 + export GOVC_URL='vCenter IP OR FQDN' + export GOVC_USERNAME='vCenter User' + export GOVC_PASSWORD='vCenter Password' + export GOVC_INSECURE=1 * Find Node VM Paths - govc ls /datacenter/vm/ + govc ls /datacenter/vm/ * Set disk.EnableUUID to true for all VMs - govc vm.change -e="disk.enableUUID=1" -vm='VM Path' + govc vm.change -e="disk.enableUUID=1" -vm='VM Path' Note: If Kubernetes Node VMs are created from template VM then `disk.EnableUUID=1` can be set on the template VM. VMs cloned from this template, will automatically inherit this property. @@ -197,7 +197,7 @@ Please visit [known issues](https://vmware.github.io/vsphere-storage-for-kuberne ## Support Level -For quick support please join VMware Code Slack ([#kubernetes](https://vmwarecode.slack.com/messages/kubernetes/)) and post your question. +For quick support please join VMware Code Slack ([kubernetes](https://vmwarecode.slack.com/messages/kubernetes/)) and post your question. IaaS Provider | Config. Mgmt | OS | Networking | Docs | Conforms | Support Level -------------------- | ------------ | ------ | ---------- | --------------------------------------------- | --------- | ---------------------------- diff --git a/docs/setup/independent/create-cluster-kubeadm.md b/docs/setup/independent/create-cluster-kubeadm.md index 65a05b634d..ccd155adaa 100644 --- a/docs/setup/independent/create-cluster-kubeadm.md +++ b/docs/setup/independent/create-cluster-kubeadm.md @@ -103,6 +103,7 @@ kubeadm init ``` **Note:** + - You need to choose a Pod Network Plugin in the next step. Depending on what third-party provider you choose, you might have to set the `--pod-network-cidr` to something provider-specific. The tabs below will contain a notice about what flags @@ -214,7 +215,8 @@ Please select one of the tabs to see installation instructions for the respectiv The official Calico guide is [here](http://docs.projectcalico.org/latest/getting-started/kubernetes/installation/hosted/kubeadm/). **Note:** - - In order for Network Policy to work correctly, you need to pass `--pod-network-cidr=192.168.0.0/16` to `kubeadm init` + + - In order for Network Policy to work correctly, you need to pass `--pod-network-cidr=192.168.0.0/16` to `kubeadm init`. - Calico works on `amd64` only. ```shell @@ -227,6 +229,7 @@ kubectl apply -f http://docs.projectcalico.org/v2.4/getting-started/kubernetes/i The official Canal set-up guide is [here](https://github.com/projectcalico/canal/tree/master/k8s-install). **Note:** + - For Canal to work correctly, `--pod-network-cidr=10.244.0.0/16` has to be passed to `kubeadm init`. - Canal works on `amd64` only. @@ -239,6 +242,7 @@ kubectl apply -f https://raw.githubusercontent.com/projectcalico/canal/master/k8 {% capture flannel %} **Note:** + - For flannel to work correctly, `--pod-network-cidr=10.244.0.0/16` has to be passed to `kubeadm init`. - flannel works on `amd64`, `arm`, `arm64` and `ppc64le`, but for it to work on an other platform than `amd64` you have to manually download the manifest and replace `amd64` occurences with your chosen platform.