From 9794339d2a04f710864fee8a341e1701de7c594e Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Sun, 25 Jun 2017 22:46:02 +0200 Subject: [PATCH 1/5] Rename last remaining reference of kargo to kubespray --- docs/tasks/administer-cluster/cluster-management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tasks/administer-cluster/cluster-management.md b/docs/tasks/administer-cluster/cluster-management.md index f243a992da..4212f496d0 100644 --- a/docs/tasks/administer-cluster/cluster-management.md +++ b/docs/tasks/administer-cluster/cluster-management.md @@ -66,7 +66,7 @@ The node upgrade process is user-initiated and is described in the [GKE document Different providers, and tools, will manage upgrades differently. It is recommended that you consult their main documentation regarding upgrades. * [kops](https://github.com/kubernetes/kops) -* [kargo](https://github.com/kubernetes-incubator/kargo) +* [kubespray](https://github.com/kubernetes-incubator/kubespray) * [CoreOS Tectonic](https://coreos.com/tectonic/docs/latest/admin/upgrade.html) * ... From 8c414800a04a7c5a019aaf5c3178e53f2287b650 Mon Sep 17 00:00:00 2001 From: Michail Kargakis Date: Tue, 23 May 2017 12:26:16 +0200 Subject: [PATCH 2/5] Document pod-template-hash label Signed-off-by: Michail Kargakis --- .../workloads/controllers/deployment.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/concepts/workloads/controllers/deployment.md b/docs/concepts/workloads/controllers/deployment.md index db77c6b29a..0cb098195d 100644 --- a/docs/concepts/workloads/controllers/deployment.md +++ b/docs/concepts/workloads/controllers/deployment.md @@ -100,12 +100,22 @@ nginx-deployment-2035384211-qqcnn 1/1 Running 0 18s app The created ReplicaSet will ensure that there are three nginx Pods at all times. -**Note:** You must specify appropriate selector and pod template labels of a Deployment (in this case, -`app = nginx`), i.e. don't overlap with other controllers (including Deployments, ReplicaSets, -ReplicationControllers, etc.) Kubernetes won't stop you from doing that, and if you end up with multiple -controllers that have overlapping selectors, those controllers will fight with each other and won't behave +**Note:** You must specify an appropriate selector and pod template labels in a Deployment (in this case, +`app = nginx`), i.e. don't overlap with other controllers (including other Deployments, ReplicaSets, +StatefulSets, etc.). Kubernetes won't stop you from doing that, and if you end up with multiple +controllers that have overlapping selectors, those controllers may fight with each other and won't behave correctly. +### Pod-template-hash label + +**Note:** This label is not meant to be mutated by users! + +Note the pod-template-hash label in the example output in the pod labels above. pod-template-hash is added by the +Deployment controller in every ReplicaSet that a Deployment creates or adopts. Its purpose is so that children +ReplicaSets of a Deployment will not overlap among them. It is computed by hashing the PodTemplate of the ReplicaSet +and using the resulting hash as the label value that will be added in the ReplicaSet selector, pod template labels, +and in any existing Pods that the ReplicaSet may have. + ## Updating a Deployment **Note:** a Deployment's rollout is triggered if and only if the Deployment's pod template (i.e. `.spec.template`) From 386a2a0982b7a4800b33e77cd50a2246b9f570e1 Mon Sep 17 00:00:00 2001 From: hanks Date: Sun, 25 Jun 2017 12:05:56 +0900 Subject: [PATCH 3/5] Fix typo trivial update `kublet` to `kubelet` --- docs/concepts/workloads/pods/pod-lifecycle.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concepts/workloads/pods/pod-lifecycle.md b/docs/concepts/workloads/pods/pod-lifecycle.md index a9ce4a8a76..ea478e377d 100644 --- a/docs/concepts/workloads/pods/pod-lifecycle.md +++ b/docs/concepts/workloads/pods/pod-lifecycle.md @@ -66,7 +66,7 @@ and Unknown. A [Probe](/docs/resources-reference/v1.6/#probe-v1-core) is a diagnostic performed periodically by the [kubelet](/docs/admin/kubelet/) on a Container. To perform a diagnostic, -the kublet calls a +the kubelet calls a [Handler](https://godoc.org/k8s.io/kubernetes/pkg/api/v1#Handler) implemented by the Container. There are three types of handlers: From 8716e152b39a16fda84b285c56a242c62cec76e5 Mon Sep 17 00:00:00 2001 From: Denis Gladkikh Date: Sun, 25 Jun 2017 06:14:44 -0700 Subject: [PATCH 4/5] CronJobs aren't enabled in 1.6 by default --- docs/concepts/workloads/controllers/cron-jobs.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/concepts/workloads/controllers/cron-jobs.md b/docs/concepts/workloads/controllers/cron-jobs.md index e823dfb09a..82f9b2a078 100644 --- a/docs/concepts/workloads/controllers/cron-jobs.md +++ b/docs/concepts/workloads/controllers/cron-jobs.md @@ -42,8 +42,6 @@ with batch/v2alpha1 API turned on by passing `--runtime-config=batch/v2alpha1=tr the API server (see [Turn on or off an API version for your cluster](/docs/admin/cluster-management/#turn-on-or-off-an-api-version-for-your-cluster) for more). -Beginning with 1.6 series Cron Jobs are enabled by default, but note that you can not use Cron Jobs on a hosted Kubernetes provider that has disabled alpha resources. - ## Creating a Cron Job Here is an example Cron Job. Every minute, it runs a simple job to print current time and then say From ddb6636f2ce862cdcfe178e9b5b906ffbdf67818 Mon Sep 17 00:00:00 2001 From: Jamie Hannaford Date: Thu, 22 Jun 2017 11:30:58 +0200 Subject: [PATCH 5/5] Document kubeadm KUBELET_DNS_ARGS issue --- docs/admin/kubeadm.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/admin/kubeadm.md b/docs/admin/kubeadm.md index 2c1f33718c..74f697c384 100644 --- a/docs/admin/kubeadm.md +++ b/docs/admin/kubeadm.md @@ -156,6 +156,16 @@ names `..svc.cluster.local`. You can use the update the `/etc/systemd/system/kubelet.service.d/10-kubeadm.conf` file accordingly else DNS will not function correctly. +**Note**: This flag has an effect (it's needed for the kube-dns Deployment +manifest and the API Server's serving certificate) but not as you might expect, +since you will have to modify the arguments to the kubelets in the cluster for +it to work fully. Specifying DNS parameters using this flag only is not enough. +Rewriting the kubelet's CLI arguments is out of scope for kubeadm as it should +be agnostic to how you run the kubelet. However, making all kubelets in the +cluster pick up information dynamically via the API _is_ in scope and is a +[planned feature](https://github.com/kubernetes/kubeadm/issues/28) for upcoming +releases. + - `--skip-preflight-checks` By default, kubeadm runs a series of preflight checks to validate the system