Merge pull request #14478 from ZJU-SEL/upgrade-ubuntu-1.0.6

Fix unknown admission control failure for ubuntu deployment

cluster/ubuntu/build.sh

@@ -53,7 +53,7 @@ fi
 cp $ETCD/etcd $ETCD/etcdctl binaries/master
 
 # k8s
-KUBE_VERSION=${KUBE_VERSION:-"1.0.3"}
+KUBE_VERSION=${KUBE_VERSION:-"1.0.6"}
 echo "Prepare kubernetes ${KUBE_VERSION} release ..."
 if [ ! -f kubernetes.tar.gz ] ; then
   curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v${KUBE_VERSION}/kubernetes.tar.gz -o kubernetes.tar.gz

cluster/ubuntu/config-default.sh

@@ -35,7 +35,7 @@ export SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE:-192.168.3.0/24}  # f
 export FLANNEL_NET=${FLANNEL_NET:-172.16.0.0/16}
 
 # Admission Controllers to invoke prior to persisting objects in cluster
-export ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota,DenyEscalatingExec,SecurityContextDeny
+export ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota,SecurityContextDeny
 
 SERVICE_NODE_PORT_RANGE=${SERVICE_NODE_PORT_RANGE:-"30000-32767"}
 

cluster/ubuntu/util.sh

@@ -460,7 +460,7 @@ function prepare-push() {
   fi
 }
 
-# Update a kubernetes master with required release
+# Update a kubernetes master with expected release
 function push-master {
   source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE-"config-default.sh"}"
 
@@ -502,7 +502,7 @@ function push-master {
   verify-cluster
 }
 
-# Update a kubernetes node with required release
+# Update a kubernetes node with expected release
 function push-node() {
   source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE-"config-default.sh"}"
 
@@ -545,7 +545,7 @@ function push-node() {
   
 }
 
-# Update a kubernetes cluster with required source
+# Update a kubernetes cluster with expected source
 function kube-push { 
   prepare-push
   source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE-"config-default.sh"}"

docs/getting-started-guides/ubuntu.md

@@ -36,12 +36,13 @@ Kubernetes Deployment On Bare-metal Ubuntu Nodes
 - [Introduction](#introduction)
 - [Prerequisites](#prerequisites)
 - [Starting a Cluster](#starting-a-cluster)
-    - [Download binaries](#download-binaries)
+    - [Set up working directory](#set-up-working-directory)
     - [Configure and start the kubernetes cluster](#configure-and-start-the-kubernetes-cluster)
     - [Test it out](#test-it-out)
     - [Deploy addons](#deploy-addons)
     - [Trouble shooting](#trouble-shooting)
 - [Upgrading a Cluster](#upgrading-a-cluster)
+    - [Test it out](#test-it-out-ii)
 
 ## Introduction
 
@@ -55,42 +56,40 @@ work, which has been merge into this document.
 ## Prerequisites
 
 1. The nodes have installed docker version 1.2+ and bridge-utils to manipulate linux bridge.
-2. All machines can communicate with each other. Master node needs to connect the Internet to download the necessary files, while working nodes do not.
+2. All machines can communicate with each other. Master node needs to be connected to the
+Internet to download the necessary files, while worker nodes do not.
 3. These guide is tested OK on Ubuntu 14.04 LTS 64bit server, but it can not work with
-Ubuntu 15 which use systemd instead of upstart. We are working around fixing this.
+Ubuntu 15 which uses systemd instead of upstart.
-4. Dependencies of this guide: etcd-2.0.12, flannel-0.4.0, k8s-1.0.3, may work with higher versions.
+4. Dependencies of this guide: etcd-2.0.12, flannel-0.4.0, k8s-1.0.6, may work with higher versions.
 5. All the remote servers can be ssh logged in without a password by using key authentication.
 
 
 ## Starting a Cluster
 
-### Download binaries
+### Set up working directory
 
-First clone the kubernetes github repo
+Clone the kubernetes github repo locally
 
 ``` console
 $ git clone https://github.com/kubernetes/kubernetes.git
 ```
 
-Then download all the needed binaries into given directory (cluster/ubuntu/binaries)
+#### Configure and start the Kubernetes cluster
-
-``` console
-$ cd kubernetes/cluster/ubuntu
-$ ./build.sh
-```
 
+The startup process will first download all the required binaries automatically.
+By default etcd version is 2.0.12, flannel version is 0.4.0 and k8s version is 1.0.6.
 You can customize your etcd version, flannel version, k8s version by changing corresponding variables
-`ETCD_VERSION` , `FLANNEL_VERSION` and `KUBE_VERSION` in build.sh, by default etcd version is 2.0.12,
+`ETCD_VERSION` , `FLANNEL_VERSION` and `KUBE_VERSION` like following.
-flannel version is 0.4.0 and k8s version is 1.0.3.
 
-Make sure that the involved binaries are located properly in the binaries/master
+```console
-or binaries/minion directory before you go ahead to the next step .
+$ export KUBE_VERSION=1.0.5
+$ export FLANNEL_VERSION=0.5.3
+$ export ETCD_VERSION=2.2.0
+```
 
 Note that we use flannel here to set up overlay network, yet it's optional. Actually you can build up k8s
 cluster natively, or use flannel, Open vSwitch or any other SDN tool you like.
 
-#### Configure and start the Kubernetes cluster
-
 An example cluster is listed below:
 
 | IP Address  |   Role   |
@@ -99,7 +98,7 @@ An example cluster is listed below:
 |10.10.103.162|   node   |
 |10.10.103.250| both master and node|
 
-First configure the cluster information in cluster/ubuntu/config-default.sh, below is a simple sample.
+First configure the cluster information in cluster/ubuntu/config-default.sh, following is a simple sample.
 
 ```sh
 export nodes="vcap@10.10.103.250 vcap@10.10.103.162 vcap@10.10.103.223"
@@ -113,7 +112,7 @@ export SERVICE_CLUSTER_IP_RANGE=192.168.3.0/24
 export FLANNEL_NET=172.16.0.0/16
 ```
 
-The first variable `nodes` defines all your cluster nodes, MASTER node comes first and
+The first variable `nodes` defines all your cluster nodes, master node comes first and
 separated with blank space like `<user_1@ip_1> <user_2@ip_2> <user_3@ip_3> `
 
 Then the `role` variable defines the role of above machine in the same order, "ai" stands for machine
@@ -135,24 +134,27 @@ that conflicts with your own private network range.
 The `FLANNEL_NET` variable defines the IP range used for flannel overlay network,
 should not conflict with above `SERVICE_CLUSTER_IP_RANGE`.
 
-**Note:** When deploying, master needs to connect the Internet to download the necessary files. If your machines locate in a private network that need proxy setting to connect the Internet, you can set the config `PROXY_SETTING` in cluster/ubuntu/config-default.sh such as:
+**Note:** When deploying, master needs to be connected to the Internet to download the necessary files.
+If your machines are located in a private network that need proxy setting to connect the Internet,
+you can set the config `PROXY_SETTING` in cluster/ubuntu/config-default.sh such as:
 
      PROXY_SETTING="http_proxy=http://server:port https_proxy=https://server:port"
 
-After all the above variables being set correctly, we can use following command in cluster/ directory to bring up the whole cluster.
+After all the above variables being set correctly, we can use following command in `cluster/` directory to
+bring up the whole cluster.
 
 `$ KUBERNETES_PROVIDER=ubuntu ./kube-up.sh`
 
-The scripts automatically scp binaries and config files to all the machines and start the k8s service on them.
+The scripts automatically `scp` binaries and config files to all the machines and start kubernetes
-The only thing you need to do is to type the sudo password when promoted.
+service on them. The only thing you need to do is to type the sudo password when promoted.
 
 ```console
 Deploying minion on machine 10.10.103.223
 ...
-[sudo] password to copy files and start minion: 
+[sudo] password to start minion: 
 ```
 
-If all things goes right, you will see the below message from console indicating the k8s is up.
+If everything works correctly, you will see the following message from console indicating the k8s cluster is up.
 
 ```console
 Cluster validation succeeded
@@ -160,7 +162,7 @@ Cluster validation succeeded
 
 ### Test it out
 
-You can use `kubectl` command to check if the newly created k8s is working correctly.
+You can use `kubectl` command to check if the newly created cluster is working correctly.
 The `kubectl` binary is under the `cluster/ubuntu/binaries` directory.
 You can make it available via PATH, then you can use the below command smoothly.
 
@@ -174,7 +176,7 @@ NAME            LABELS                                 STATUS
 10.10.103.250   kubernetes.io/hostname=10.10.103.250   Ready
 ```
 
-Also you can run Kubernetes [guest-example](../../examples/guestbook/) to build a redis backend cluster on the k8s．
+Also you can run Kubernetes [guest-example](../../examples/guestbook/) to build a redis backend cluster．
 
 
 ### Deploy addons
@@ -224,43 +226,38 @@ to eliminate OS-distro differences.
 
 Generally, what this approach does is quite simple:
 
-1. Download and copy binaries and configuration files to proper directories on every node
+1. Download and copy binaries and configuration files to proper directories on every node.
-2. Configure `etcd` using IPs based on input from user
+2. Configure `etcd` for master node using IPs based on input from user.
-3. Create and start flannel network
+3. Create and start flannel network for worker nodes.
 
-So if you encounter a problem, **check etcd configuration first**
+So if you encounter a problem, check etcd configuration of master node first.
-
-Please try:
 
 1. Check `/var/log/upstart/etcd.log` for suspicious etcd log
-2. Check `/etc/default/etcd`, as we do not have much input validation, a right config should be like:
+2. You may find following commands useful, the former one to bring down the cluster, while the latter one could start it again.
 
-	```sh
+```console
-	ETCD_OPTS="-name infra1 -initial-advertise-peer-urls <http://ip_of_this_node:2380> -listen-peer-urls <http://ip_of_this_node:2380> -initial-cluster-token etcd-cluster-1 -initial-cluster infra1=<http://ip_of_this_node:2380>,infra2=<http://ip_of_another_node:2380>,infra3=<http://ip_of_another_node:2380> -initial-cluster-state new"
+$ KUBERNETES_PROVIDER=ubuntu ./kube-down.sh
-	```
+$ KUBERNETES_PROVIDER=ubuntu ./kube-up.sh
+```
 
-3. You may find following commands useful, the former one to bring down the cluster, while
+3. You can also customize your own settings in `/etc/default/{component_name}` and restart it via
-the latter one could start it again.
+`$ sudo service {component_name} restart`.
-
-    ```console
-    $ KUBERNETES_PROVIDER=ubuntu ./kube-down.sh
-    $ KUBERNETES_PROVIDER=ubuntu ./kube-up.sh
-    ```
-
-4. You can also customize your own settings in `/etc/default/{component_name}`.
 
 
-### Upgrading a Cluster
+## Upgrading a Cluster
 
 If you already have a kubernetes cluster, and want to upgrade to a new version,
-you can use following command in cluster/ directory to update the whole cluster or a specified node to a new version.
+you can use following command in `cluster/` directory to update the whole cluster
+or a specified node to a new version.
 
 ```console
 $ KUBERNETES_PROVIDER=ubuntu ./kube-push.sh [-m|-n <node id>] <version>
 ```
 
 It can be done for all components (by default), master(`-m`) or specified node(`-n`).
-If the version is not specified, the script will try to use local binaries.You should ensure all the binaries are well prepared in path `cluster/ubuntu/binaries`.
+Upgrading a single node is currently experimental.
+If the version is not specified, the script will try to use local binaries. You should ensure all
+the binaries are well prepared in the expected directory path cluster/ubuntu/binaries.
 
 ```console
 $ tree cluster/ubuntu/binaries
@@ -279,21 +276,29 @@ binaries/
     └── kube-proxy
 ```
 
-Upgrading single node is experimental now. You can use following command to get a help.
+You can use following command to get a help.
 
 ```console
 $ KUBERNETES_PROVIDER=ubuntu ./kube-push.sh -h
 ```
 
-Some examples are as follows:
+Here are some examples:
 
 * upgrade master to version 1.0.5: `$ KUBERNETES_PROVIDER=ubuntu ./kube-push.sh -m 1.0.5`
 * upgrade node 10.10.103.223 to version 1.0.5 : `$ KUBERNETES_PROVIDER=ubuntu ./kube-push.sh -n 10.10.103.223 1.0.5`
 * upgrade master and all nodes to version 1.0.5: `$ KUBERNETES_PROVIDER=ubuntu ./kube-push.sh 1.0.5`
 
 The script will not delete any resources of your cluster, it just replaces the binaries.
-You can use `kubectl` command to check if the newly upgraded k8s is working correctly.
+
-For example, use `$ kubectl get nodes` to see if all of your nodes are ready.Or refer to [test-it-out](ubuntu.md#test-it-out)
+### Test it out
+
+You can use the `kubectl` command to check if the newly upgraded kubernetes cluster is working correctly. See
+also [test-it-out](ubuntu.md#test-it-out)
+
+To make sure the version of the upgraded cluster is what you expect, you will find these commands helpful.
+* upgrade all components or master: `$ kubectl version`. Check the *Server Version*.
+* upgrade node 10.10.102.223: `$ ssh -t vcap@10.10.102.223 'cd /opt/bin && sudo ./kubelet --version'`
+
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/getting-started-guides/ubuntu.md?pixel)]()