Merge branch 'master' of https://github.com/kubernetes/kubernetes.git…

…hub.io into release-1.7

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Add TCP socket health check example (#3977)
  Update networking.md (#3950)
  [authorization] fix invalid href for webhook

docs/admin/authorization/webhook.md

@@ -141,8 +141,8 @@ Access to other non-resource paths can be disallowed without restricting access
 to the REST api.
 
 For further documentation refer to the authorization.v1beta1 API objects and
-plugin/pkg/auth/authorizer/webhook/webhook.go.
+[webhook.go](https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go).
 
 {% endcapture %}
 
-{% include templates/concept.md %}
+{% include templates/concept.md %}

docs/concepts/cluster-administration/networking.md

@@ -223,6 +223,12 @@ Weave Net runs as a [CNI plug-in](https://www.weave.works/docs/net/latest/cni-pl
 or stand-alone.  In either version, it doesn't require any configuration or extra code
 to run, and in both cases, the network provides one IP address per pod - as is standard for Kubernetes.
 
+### CNI-Genie from Huawei
+
+[CNI-Genie](https://github.com/Huawei-PaaS/CNI-Genie) is a CNI plugin that enables Kubernetes to [simultanously have access to different implementations](https://github.com/Huawei-PaaS/CNI-Genie/blob/master/docs/multiple-cni-plugins/README.md#what-cni-genie-feature-1-multiple-cni-plugins-enables) of the [Kubernetes network model](https://github.com/kubernetes/kubernetes.github.io/blob/master/docs/concepts/cluster-administration/networking.md#kubernetes-model) in runtime. This includes any implementation that runs as a [CNI plugin](https://github.com/containernetworking/cni#3rd-party-plugins), such as [Flannel](https://github.com/coreos/flannel#flannel), [Calico](http://docs.projectcalico.org/), [Romana](http://romana.io), [Weave-net](https://www.weave.works/products/weave-net/).
+
+CNI-Genie also supports [assigning multiple IP addresses to a pod](https://github.com/Huawei-PaaS/CNI-Genie/blob/master/docs/multiple-ips/README.md#feature-2-extension-cni-genie-multiple-ip-addresses-per-pod), each from a different CNI plugin.
+
 ## Other reading
 
 The early design of the networking model and its rationale, and some future

docs/user-guide/walkthrough/k8s201.md

@@ -216,6 +216,9 @@ Here is an example config for a Pod with an HTTP health check ([pod-with-http-he
 
 {% include code.html language="yaml" file="pod-with-http-healthcheck.yaml" ghlink="/docs/user-guide/walkthrough/pod-with-http-healthcheck.yaml" %}
 
+And here is an example config for a Pod with a TCP Socket health check ([pod-with-tcp-socket-healthcheck.yaml](/docs/user-guide/walkthrough/pod-with-tcp-socket-healthcheck.yaml)):
+
+{% include code.html language="yaml" file="pod-with-tcp-socket-healthcheck.yaml" ghlink="/docs/user-guide/walkthrough/pod-with-tcp-socket-healthcheck.yaml" %}
 
 For more information about health checking, see [Container Probes](/docs/user-guide/pod-states/#container-probes).
 

docs/user-guide/walkthrough/pod-with-http-healthcheck.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: pod-with-healthcheck
+  name: pod-with-http-healthcheck
 spec:
   containers:
   - name: nginx

docs/user-guide/walkthrough/pod-with-tcp-socket-healthcheck.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: pod-with-tcp-socket-healthcheck
+spec:
+  containers:
+  - name: redis
+    image: redis
+    # defines the health checking
+    livenessProbe:
+      # a TCP socket probe
+      tcpSocket:
+        port: 6379
+      # length of time to wait for a pod to initialize
+      # after pod startup, before applying health checking
+      initialDelaySeconds: 30
+      timeoutSeconds: 1
+    ports:
+    - containerPort: 6379

test/examples_test.go

@@ -215,14 +215,15 @@ func walkConfigFiles(inDir string, fn func(name, path string, data [][]byte)) er
 func TestExampleObjectSchemas(t *testing.T) {
 	cases := map[string]map[string][]runtime.Object{
 		"../docs/user-guide/walkthrough": {
-			"deployment":                {&extensions.Deployment{}},
-			"deployment-update":         {&extensions.Deployment{}},
-			"pod-nginx":                 {&api.Pod{}},
-			"pod-nginx-with-label":      {&api.Pod{}},
-			"pod-redis":                 {&api.Pod{}},
-			"pod-with-http-healthcheck": {&api.Pod{}},
-			"podtemplate":               {&api.PodTemplate{}},
-			"service":                   {&api.Service{}},
+			"deployment":				{&extensions.Deployment{}},
+			"deployment-update":			{&extensions.Deployment{}},
+			"pod-nginx":				{&api.Pod{}},
+			"pod-nginx-with-label":			{&api.Pod{}},
+			"pod-redis":				{&api.Pod{}},
+			"pod-with-http-healthcheck":		{&api.Pod{}},
+			"pod-with-tcp-socket-healthcheck": 	{&api.Pod{}},
+			"podtemplate":				{&api.PodTemplate{}},
+			"service":				{&api.Service{}},
 		},
 		"../docs/user-guide/update-demo": {
 			"kitten-rc":   {&api.ReplicationController{}},