From eede65a3c97c603bf18b91f71269c9711477d9a6 Mon Sep 17 00:00:00 2001 From: Yecheng Fu Date: Tue, 15 Aug 2017 13:39:25 +0800 Subject: [PATCH 01/10] FIX: Use absoluate path instead of relative. (#4730) --- docs/tasks/administer-cluster/cpu-constraint-namespace.md | 8 ++++---- docs/tasks/administer-cluster/cpu-default-namespace.md | 4 ++-- .../administer-cluster/memory-constraint-namespace.md | 6 +++--- docs/tasks/administer-cluster/memory-default-namespace.md | 4 ++-- docs/tasks/administer-cluster/quota-api-object.md | 6 +++--- .../administer-cluster/quota-memory-cpu-namespace.md | 6 +++--- docs/tasks/administer-cluster/quota-pod-namespace.md | 6 +++--- docs/tasks/configure-pod-container/assign-cpu-resource.md | 4 ++-- .../configure-pod-container/opaque-integer-resource.md | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/tasks/administer-cluster/cpu-constraint-namespace.md b/docs/tasks/administer-cluster/cpu-constraint-namespace.md index e1d5e04080..047a140227 100644 --- a/docs/tasks/administer-cluster/cpu-constraint-namespace.md +++ b/docs/tasks/administer-cluster/cpu-constraint-namespace.md @@ -195,7 +195,7 @@ resources: Because your Container did not specify its own CPU request and limit, it was given the [default CPU request and limit](/docs/tasks/administer-cluster/default-cpu-request-limit/) from the LimitRange. -* [Configure Memory and CPU Quotas for a Namespace](docs/tasks/administer-cluster/quota-memory-cpu-namespace) +* [Configure Memory and CPU Quotas for a Namespace](/docs/tasks/administer-cluster/quota-memory-cpu-namespace) At this point, your Container might be running or it might not be running. Recall that a prerequisite for this task is that your Nodes have at least 1 CPU. If each of your Nodes has only 1 CPU, then there might not be enough allocatable CPU on any Node to accommodate a request @@ -241,9 +241,9 @@ kubectl delete namespace constraints-cpu-example ### For cluster administrators -* [Configure Default Memory Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-memory-request-limit/) +* [Configure Default Memory Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-memory-request-limit/) -* [Configure Default CPU Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-cpu-request-limit/) +* [Configure Default CPU Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-cpu-request-limit/) * [Configure Minimum and Maximum Memory Constraints for a Namespace](/docs/tasks/administer-cluster/memory-constraint-namespace/) @@ -257,7 +257,7 @@ kubectl delete namespace constraints-cpu-example * [Assign Memory Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/) -* [Assign CPU Resources to Containers and Pods](docs/tasks/configure-pod-container/assign-cpu-resource/) +* [Assign CPU Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-cpu-resource/) * [Configure Quality of Service for Pods](/docs/tasks/configure-pod-container/quality-service-pod/) diff --git a/docs/tasks/administer-cluster/cpu-default-namespace.md b/docs/tasks/administer-cluster/cpu-default-namespace.md index 562a5d65f3..d0c7e9cf8c 100644 --- a/docs/tasks/administer-cluster/cpu-default-namespace.md +++ b/docs/tasks/administer-cluster/cpu-default-namespace.md @@ -153,7 +153,7 @@ it can be allowed to run in a namespace that is restricted by a quota. ### For cluster administrators -* [Configure Default Memory Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-memory-request-limit/) +* [Configure Default Memory Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-memory-request-limit/) * [Configure Minimum and Maximum Memory Constraints for a Namespace](/docs/tasks/administer-cluster/memory-constraint-namespace/) @@ -169,7 +169,7 @@ it can be allowed to run in a namespace that is restricted by a quota. * [Assign Memory Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/) -* [Assign CPU Resources to Containers and Pods](docs/tasks/configure-pod-container/assign-cpu-resource/) +* [Assign CPU Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-cpu-resource/) * [Configure Quality of Service for Pods](/docs/tasks/configure-pod-container/quality-service-pod/) diff --git a/docs/tasks/administer-cluster/memory-constraint-namespace.md b/docs/tasks/administer-cluster/memory-constraint-namespace.md index ac4afcdff5..821d1ac5e8 100644 --- a/docs/tasks/administer-cluster/memory-constraint-namespace.md +++ b/docs/tasks/administer-cluster/memory-constraint-namespace.md @@ -243,9 +243,9 @@ kubectl delete namespace constraints-mem-example ### For cluster administrators -* [Configure Default Memory Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-memory-request-limit/) +* [Configure Default Memory Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-memory-request-limit/) -* [Configure Default CPU Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-cpu-request-limit/) +* [Configure Default CPU Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-cpu-request-limit/) * [Configure Minimum and Maximum CPU Constraints for a Namespace](/docs/tasks/administer-cluster/cpu-constraint-namespace/) @@ -259,7 +259,7 @@ kubectl delete namespace constraints-mem-example * [Assign Memory Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/) -* [Assign CPU Resources to Containers and Pods](docs/tasks/configure-pod-container/assign-cpu-resource/) +* [Assign CPU Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-cpu-resource/) * [Configure Quality of Service for Pods](/docs/tasks/configure-pod-container/quality-service-pod/) diff --git a/docs/tasks/administer-cluster/memory-default-namespace.md b/docs/tasks/administer-cluster/memory-default-namespace.md index 7c151d9896..5fb40e209b 100644 --- a/docs/tasks/administer-cluster/memory-default-namespace.md +++ b/docs/tasks/administer-cluster/memory-default-namespace.md @@ -166,7 +166,7 @@ it can be allowed to run in a namespace that is restricted by a quota. ### For cluster administrators -* [Configure Default CPU Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-cpu-request-limit/) +* [Configure Default CPU Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-cpu-request-limit/) * [Configure Minimum and Maximum Memory Constraints for a Namespace](/docs/tasks/administer-cluster/memory-constraint-namespace/) @@ -182,7 +182,7 @@ it can be allowed to run in a namespace that is restricted by a quota. * [Assign Memory Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/) -* [Assign CPU Resources to Containers and Pods](docs/tasks/configure-pod-container/assign-cpu-resource/) +* [Assign CPU Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-cpu-resource/) * [Configure Quality of Service for Pods](/docs/tasks/configure-pod-container/quality-service-pod/) diff --git a/docs/tasks/administer-cluster/quota-api-object.md b/docs/tasks/administer-cluster/quota-api-object.md index 7ef75d34df..a9cbaf0b31 100644 --- a/docs/tasks/administer-cluster/quota-api-object.md +++ b/docs/tasks/administer-cluster/quota-api-object.md @@ -145,9 +145,9 @@ kubectl delete namespace quota-object-example ### For cluster administrators -* [Configure Default Memory Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-memory-request-limit/) +* [Configure Default Memory Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-memory-request-limit/) -* [Configure Default CPU Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-cpu-request-limit/) +* [Configure Default CPU Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-cpu-request-limit/) * [Configure Minimum and Maximum Memory Constraints for a Namespace](/docs/tasks/administer-cluster/memory-constraint-namespace/) @@ -161,7 +161,7 @@ kubectl delete namespace quota-object-example * [Assign Memory Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/) -* [Assign CPU Resources to Containers and Pods](docs/tasks/configure-pod-container/assign-cpu-resource/) +* [Assign CPU Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-cpu-resource/) * [Configure Quality of Service for Pods](/docs/tasks/configure-pod-container/quality-service-pod/) diff --git a/docs/tasks/administer-cluster/quota-memory-cpu-namespace.md b/docs/tasks/administer-cluster/quota-memory-cpu-namespace.md index e27e6192ce..95b757aa56 100644 --- a/docs/tasks/administer-cluster/quota-memory-cpu-namespace.md +++ b/docs/tasks/administer-cluster/quota-memory-cpu-namespace.md @@ -150,9 +150,9 @@ kubectl delete namespace quota-mem-cpu-example ### For cluster administrators -* [Configure Default Memory Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-memory-request-limit/) +* [Configure Default Memory Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-memory-request-limit/) -* [Configure Default CPU Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-cpu-request-limit/) +* [Configure Default CPU Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-cpu-request-limit/) * [Configure Minimum and Maximum Memory Constraints for a Namespace](/docs/tasks/administer-cluster/memory-constraint-namespace/) @@ -166,7 +166,7 @@ kubectl delete namespace quota-mem-cpu-example * [Assign Memory Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/) -* [Assign CPU Resources to Containers and Pods](docs/tasks/configure-pod-container/assign-cpu-resource/) +* [Assign CPU Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-cpu-resource/) * [Configure Quality of Service for Pods](/docs/tasks/configure-pod-container/quality-service-pod/) diff --git a/docs/tasks/administer-cluster/quota-pod-namespace.md b/docs/tasks/administer-cluster/quota-pod-namespace.md index 6d21937593..cbbdb4bcb6 100644 --- a/docs/tasks/administer-cluster/quota-pod-namespace.md +++ b/docs/tasks/administer-cluster/quota-pod-namespace.md @@ -111,9 +111,9 @@ kubectl delete namespace quota-pod-example ### For cluster administrators -* [Configure Default Memory Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-memory-request-limit/) +* [Configure Default Memory Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-memory-request-limit/) -* [Configure Default CPU Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-cpu-request-limit/) +* [Configure Default CPU Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-cpu-request-limit/) * [Configure Minimum and Maximum Memory Constraints for a Namespace](/docs/tasks/administer-cluster/memory-constraint-namespace/) @@ -127,7 +127,7 @@ kubectl delete namespace quota-pod-example * [Assign Memory Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/) -* [Assign CPU Resources to Containers and Pods](docs/tasks/configure-pod-container/assign-cpu-resource/) +* [Assign CPU Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-cpu-resource/) * [Configure Quality of Service for Pods](/docs/tasks/configure-pod-container/quality-service-pod/) diff --git a/docs/tasks/configure-pod-container/assign-cpu-resource.md b/docs/tasks/configure-pod-container/assign-cpu-resource.md index 034988c7da..76298b2859 100644 --- a/docs/tasks/configure-pod-container/assign-cpu-resource.md +++ b/docs/tasks/configure-pod-container/assign-cpu-resource.md @@ -253,9 +253,9 @@ kubectl delete namespace cpu-example ### For cluster administrators -* [Configure Default Memory Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-memory-request-limit/) +* [Configure Default Memory Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-memory-request-limit/) -* [Configure Default CPU Requests and Limits for a Namespace](docs/tasks/administer-cluster/default-cpu-request-limit/) +* [Configure Default CPU Requests and Limits for a Namespace](/docs/tasks/administer-cluster/default-cpu-request-limit/) * [Configure Minimum and Maximum Memory Constraints for a Namespace](/docs/tasks/administer-cluster/memory-constraint-namespace/) diff --git a/docs/tasks/configure-pod-container/opaque-integer-resource.md b/docs/tasks/configure-pod-container/opaque-integer-resource.md index 7451f3b774..fff8f55703 100644 --- a/docs/tasks/configure-pod-container/opaque-integer-resource.md +++ b/docs/tasks/configure-pod-container/opaque-integer-resource.md @@ -126,7 +126,7 @@ kubectl delete pod oir-demo ### For application developers * [Assign Memory Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/) -* [Assign CPU Resources to Containers and Pods](docs/tasks/configure-pod-container/assign-cpu-resource/) +* [Assign CPU Resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-cpu-resource/) ### For cluster administrators From 506842bc165cf1c4e205e4fcdaf5e678509a55d3 Mon Sep 17 00:00:00 2001 From: Ce Gu Date: Tue, 15 Aug 2017 13:51:37 +0800 Subject: [PATCH 02/10] Remove duplicate 'the'. (#4715) * Remove duplicate 'the'. * Update add-entries-to-pod-etc-hosts-with-host-aliases.md --- .../add-entries-to-pod-etc-hosts-with-host-aliases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md b/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md index 1e3892dd8a..b3bcab7e71 100644 --- a/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md +++ b/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md @@ -38,7 +38,7 @@ by default, the hosts file only includes ipv4 and ipv6 boilerplates like `localh ## Adding Additional Entries with HostAliases -In addition the the default boilerplate, we can add additional entries to the hosts file to resolve `foo.local`, `bar.local` to `127.0.0.1` and `foo.remote`, `bar.remote` to `10.1.2.3`, we can by adding HostAliases to the Pod under `.spec.hostAliases`: +In addition to the default boilerplate, we can add additional entries to the hosts file to resolve `foo.local`, `bar.local` to `127.0.0.1` and `foo.remote`, `bar.remote` to `10.1.2.3`, we can by adding HostAliases to the Pod under `.spec.hostAliases`: {% include code.html language="yaml" file="hostaliases-pod.yaml" ghlink="/docs/concepts/services-networking/hostaliases-pod.yaml" %} From fe11c3f8f70948e4d10bf46ffdb9185d858ec97b Mon Sep 17 00:00:00 2001 From: TigerXu Date: Tue, 15 Aug 2017 13:58:11 +0800 Subject: [PATCH 03/10] Update extensible-admission-controllers.md (#4795) fix typo --- docs/admin/extensible-admission-controllers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/extensible-admission-controllers.md b/docs/admin/extensible-admission-controllers.md index 1828ba507c..dd1455ddad 100644 --- a/docs/admin/extensible-admission-controllers.md +++ b/docs/admin/extensible-admission-controllers.md @@ -35,7 +35,7 @@ This page describes how to use Initializers and External Admission Webhooks. * A list of pending pre-initialization tasks, stored in every object's metadata (e.g., "AddMyCorporatePolicySidecar"). -* A user customized controller, which actually perform those tasks. The name of the task +* A user customized controller, which actually performs those tasks. The name of the task corresponds to the controller which performs the task. For clarity, we call them *initializer controllers* in this page. From f851afc08403f5ec881368d148dd4fea6dcef356 Mon Sep 17 00:00:00 2001 From: Dhilip Date: Tue, 15 Aug 2017 12:46:49 +0530 Subject: [PATCH 04/10] [minor] fixed the grammar (#4776) * fix a simple typo fix a simple typo * update notes callout update notes callout --- docs/concepts/abstractions/pod-termination.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/concepts/abstractions/pod-termination.md b/docs/concepts/abstractions/pod-termination.md index 5276dae617..327bf9cf9d 100644 --- a/docs/concepts/abstractions/pod-termination.md +++ b/docs/concepts/abstractions/pod-termination.md @@ -8,8 +8,9 @@ Since Pods represent processes running on your cluster, Kubernetes provides for 1. You send a command or API call to terminate the Pod. 1. Kubernetes updates the Pod status to reflect the time after which the Pod is to be considered "dead" (the time of the termination request plus the grace period). 1. Kubernetes marks the Pod state as "Terminating" and stops sending traffic to the Pod. -1. Kubernetes send a `TERM` signal to the Pod, indicating that the Pod should shut down. +1. Kubernetes sends a `TERM` signal to the Pod, indicating that the Pod should shut down. 1. When the grace period expires, Kubernetes issues a `SIGKILL` to any processes still running in the Pod. 1. Kubernetes removes the Pod from the API server on the Kubernetes Master. -> **Note:** The grace period is configurable; you can set your own grace period when interacting with the cluster to request termination, such as using the `kubectl delete` command. See the [Terminating a Pod]() tutorial for more information. \ No newline at end of file +> **Note:** The grace period is configurable; you can set your own grace period when interacting with the cluster to request termination, such as using the `kubectl delete` command. See the [Terminating a Pod]() tutorial for more information. +{: .note} From 93cb9e0275cddc23e7321cd29192cbd9a8161ace Mon Sep 17 00:00:00 2001 From: Stewart-YU Date: Tue, 15 Aug 2017 15:24:23 +0800 Subject: [PATCH 05/10] Update create-external-load-balancer.md (#4882) Fix leading spaces in commands. --- .../create-external-load-balancer.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tasks/access-application-cluster/create-external-load-balancer.md b/docs/tasks/access-application-cluster/create-external-load-balancer.md index 29533f315c..9947939bc9 100644 --- a/docs/tasks/access-application-cluster/create-external-load-balancer.md +++ b/docs/tasks/access-application-cluster/create-external-load-balancer.md @@ -59,7 +59,7 @@ You can alternatively create the service with the `kubectl expose` command and its `--type=LoadBalancer` flag: ```bash - kubectl expose rc example --port=8765 --target-port=9376 \ +kubectl expose rc example --port=8765 --target-port=9376 \ --name=example-service --type=LoadBalancer ``` @@ -76,7 +76,7 @@ You can find the IP address created for your service by getting the service information through `kubectl`: ```bash - kubectl describe services example-service +kubectl describe services example-service ``` which should produce output like this: From e7d7acf2e8504f165656ec4fb52bb4b165175c8f Mon Sep 17 00:00:00 2001 From: Stewart-YU Date: Tue, 15 Aug 2017 15:29:38 +0800 Subject: [PATCH 06/10] Update configure-cloud-provider-firewall.md (#4884) The code highlight is unnecessary here. --- .../configure-cloud-provider-firewall.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md b/docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md index 09af739396..0b7f5603ba 100644 --- a/docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md +++ b/docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md @@ -85,7 +85,7 @@ Consider: * You open the firewall for port 80 for all nodes in your cluster, so that the external Service actually can deliver packets to your Service * You start an nginx server, running on port 80 on the host virtual machine - (IP Address 2.3.4.5). This nginx is **also** exposed to the internet on + (IP Address 2.3.4.5). This nginx is also exposed to the internet on the VM's external IP address. Consequently, please be careful when opening firewalls in Google Compute Engine From 5971ca0158c98879939701c87f8e595e154122c4 Mon Sep 17 00:00:00 2001 From: Li Yi Date: Tue, 15 Aug 2017 15:34:24 +0800 Subject: [PATCH 07/10] Add getting started guides for Alibaba Cloud (#4789) * Add getting started guides for Alibaba Cloud * Update alibaba-cloud.md * Update alibaba-cloud.md --- _data/setup.yml | 1 + docs/getting-started-guides/alibaba-cloud.md | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 docs/getting-started-guides/alibaba-cloud.md diff --git a/_data/setup.yml b/_data/setup.yml index cd17b1ce3a..576fe257c0 100644 --- a/_data/setup.yml +++ b/_data/setup.yml @@ -30,6 +30,7 @@ toc: - docs/getting-started-guides/gce.md - docs/getting-started-guides/aws.md - docs/getting-started-guides/azure.md + - docs/getting-started-guides/alibaba-cloud.md - docs/getting-started-guides/clc.md - title: Running Kubernetes on IBM Bluemix path: https://github.com/patrocinio/kubernetes-softlayer diff --git a/docs/getting-started-guides/alibaba-cloud.md b/docs/getting-started-guides/alibaba-cloud.md new file mode 100644 index 0000000000..26c9db62e9 --- /dev/null +++ b/docs/getting-started-guides/alibaba-cloud.md @@ -0,0 +1,20 @@ +--- +approvers: +- colemickens +- brendandburns +title: Running Kubernetes on Alibaba Cloud +--- + +## Alibaba Cloud Container Service + +The [Alibaba Cloud Container Service](https://www.aliyun.com/product/containerservice) lets you run and manage Docker applications on a cluster of Alibaba Cloud ECS instances. It supports the popular open source container orchestrators: Docker Swarm and Kubernetes. + +To simplify cluster deployment and management, use [Kubernetes Suppport for Alibaba Cloud Container Service](https://www.aliyun.com/solution/kubernetes/). You can get started quickly by following the [Kubernetes walk-through](https://help.aliyun.com/document_detail/53751.html), and there are some [tutorials for Kubernetes Support on Alibaba Cloud](https://yq.aliyun.com/teams/11/type_blog-cid_200-page_1) in Chinese. + +To use custom binaries or open source Kubernetes, follow the instructions below. + +## Custom Deployments + +The source code for [Kubernetes with Alibaba Cloud provider implmenetation](https://github.com/AliyunContainerService/kubernetes) is open source and available on GitHub. + +For more information, see "[Quick deployment of Kubernetes - VPC environment on Alibaba Cloud](https://www.alibabacloud.com/forum/read-830)" in English and [Chinese](https://yq.aliyun.com/articles/66474). From 43fcd5a8328ec406756ece94ee1e7f50f443f9db Mon Sep 17 00:00:00 2001 From: Lion-Wei Date: Tue, 15 Aug 2017 15:44:09 +0800 Subject: [PATCH 08/10] Update access-cluster-api.md (#4878) --- docs/tasks/administer-cluster/access-cluster-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tasks/administer-cluster/access-cluster-api.md b/docs/tasks/administer-cluster/access-cluster-api.md index 1fd97c9f07..995e8ad69d 100644 --- a/docs/tasks/administer-cluster/access-cluster-api.md +++ b/docs/tasks/administer-cluster/access-cluster-api.md @@ -169,7 +169,7 @@ There are [client libraries](/docs/reference/client-libraries/) for accessing th ### Accessing the API from a Pod When accessing the API from a pod, locating and authenticating -to the api server are somewhat different. +to the API server are somewhat different. The recommended way to locate the apiserver within the pod is with the `kubernetes` DNS name, which resolves to a Service IP which in turn From 644b6c29ed1829f3884bb9aacbad15733d9bf893 Mon Sep 17 00:00:00 2001 From: Andrew Chen Date: Tue, 15 Aug 2017 11:11:21 -0700 Subject: [PATCH 09/10] add auto-assignees --- OWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OWNERS b/OWNERS index ec534bfbfb..195e9fbc8a 100644 --- a/OWNERS +++ b/OWNERS @@ -1,3 +1,8 @@ reviewers: +- a-mccarthy +- abiogenesis-now +- bradamant3 - chenopis +- cody-clark +- steveperry-53 - zacharysarah From 2c06a7a8538f8afc0ef178e14d6118e978825661 Mon Sep 17 00:00:00 2001 From: Andrew Chen Date: Tue, 15 Aug 2017 11:45:08 -0700 Subject: [PATCH 10/10] close raw tag --- docs/getting-started-guides/mesos/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started-guides/mesos/index.md b/docs/getting-started-guides/mesos/index.md index a01d2efad8..d09b280779 100644 --- a/docs/getting-started-guides/mesos/index.md +++ b/docs/getting-started-guides/mesos/index.md @@ -247,7 +247,7 @@ sed -e "s/{{ pillar\['dns_replicas'\] }}/1/g;"\ "s/{{ pillar\['dns_domain'\] }}/cluster.local/g" \ cluster/addons/dns/kubedns-controller.yaml.in > kubedns-controller.yaml sed -e "s/{{ pillar\['dns_server'\] }}/10.10.10.10/g" \ - cluster/addons/dns/kubedns-svc.yaml.in > kubedns-svc.yaml + cluster/addons/dns/kubedns-svc.yaml.in > kubedns-svc.yaml{% endraw %} ``` Now the kube-dns pod and service are ready to be launched: