From 8dd901ee98fb2434755cc895818f362e077967be Mon Sep 17 00:00:00 2001 From: Cao Shufeng Date: Mon, 5 Jun 2017 11:42:13 +0800 Subject: [PATCH 1/3] [authorization] fix invalid href for webhook --- docs/admin/authorization/webhook.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/admin/authorization/webhook.md b/docs/admin/authorization/webhook.md index 56d60e644d..b89182fb6f 100644 --- a/docs/admin/authorization/webhook.md +++ b/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 %} \ No newline at end of file +{% include templates/concept.md %} From 8d20ed8580624ed2833732f889a9c02ca0651aa8 Mon Sep 17 00:00:00 2001 From: kshafiee Date: Mon, 5 Jun 2017 11:04:45 -0700 Subject: [PATCH 2/3] Update networking.md (#3950) * Update networking.md Added CNI-Genie as one of the many options * Update networking.md Addressed! * Update networking.md --- docs/concepts/cluster-administration/networking.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/concepts/cluster-administration/networking.md b/docs/concepts/cluster-administration/networking.md index ef1a7c3af6..aa98560944 100644 --- a/docs/concepts/cluster-administration/networking.md +++ b/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 From 9f2ecee2608a6b7bcd64c3f7bc3963f88bb33232 Mon Sep 17 00:00:00 2001 From: tompizmor Date: Mon, 5 Jun 2017 22:50:29 +0200 Subject: [PATCH 3/3] Add TCP socket health check example (#3977) * Add TCP socket health check example * Add test case for pod-with-tcp-socket-healthcheck --- docs/user-guide/walkthrough/k8s201.md | 3 +++ .../pod-with-http-healthcheck.yaml | 2 +- .../pod-with-tcp-socket-healthcheck.yaml | 19 +++++++++++++++++++ test/examples_test.go | 17 +++++++++-------- 4 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 docs/user-guide/walkthrough/pod-with-tcp-socket-healthcheck.yaml diff --git a/docs/user-guide/walkthrough/k8s201.md b/docs/user-guide/walkthrough/k8s201.md index 411b396e78..27d2c7a525 100644 --- a/docs/user-guide/walkthrough/k8s201.md +++ b/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). diff --git a/docs/user-guide/walkthrough/pod-with-http-healthcheck.yaml b/docs/user-guide/walkthrough/pod-with-http-healthcheck.yaml index c697eba1df..3f40854e92 100644 --- a/docs/user-guide/walkthrough/pod-with-http-healthcheck.yaml +++ b/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 diff --git a/docs/user-guide/walkthrough/pod-with-tcp-socket-healthcheck.yaml b/docs/user-guide/walkthrough/pod-with-tcp-socket-healthcheck.yaml new file mode 100644 index 0000000000..5f0bca283c --- /dev/null +++ b/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 diff --git a/test/examples_test.go b/test/examples_test.go index 1c3ad2e4d0..f923547032 100644 --- a/test/examples_test.go +++ b/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{}},