From 59689b8dea9fb33e076dc6d15203c47bd46684ec Mon Sep 17 00:00:00 2001 From: PriyanshuAhlawat Date: Mon, 28 Feb 2022 19:00:41 +0530 Subject: [PATCH 1/3] Update kubelet-integration.md --- .../tools/kubeadm/kubelet-integration.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md b/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md index bae9af6bbb..e3ab1395a2 100644 --- a/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md +++ b/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md @@ -51,7 +51,7 @@ by the kubelet, using the `--cluster-dns` flag. This setting needs to be the sam on every manager and Node in the cluster. The kubelet provides a versioned, structured API object that can configure most parameters in the kubelet and push out this configuration to each running kubelet in the cluster. This object is called -[`KubeletConfiguration`](/docs/reference/config-api/kubelet-config.v1beta1/). +[`KubeletConfiguration`](/docs/reference/config-api/kubelet-config.v1beta1/). The `KubeletConfiguration` allows the user to specify flags such as the cluster DNS IP addresses expressed as a list of values to a camelCased key, illustrated by the following example: @@ -171,8 +171,7 @@ It augments the basic ```none [Service] -Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf ---kubeconfig=/etc/kubernetes/kubelet.conf" +Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf" Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml" # This is a file that "kubeadm init" and "kubeadm join" generate at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically @@ -206,5 +205,3 @@ The DEB and RPM packages shipped with the Kubernetes releases are: | `kubelet` | Installs the kubelet binary in `/usr/bin` and CNI binaries in `/opt/cni/bin`. | | `kubectl` | Installs the `/usr/bin/kubectl` binary. | | `cri-tools` | Installs the `/usr/bin/crictl` binary from the [cri-tools git repository](https://github.com/kubernetes-sigs/cri-tools). | - - From 30abee1696af1b895d9d233a0fafd1e1da3175c3 Mon Sep 17 00:00:00 2001 From: PriyanshuAhlawat Date: Mon, 28 Feb 2022 22:54:45 +0530 Subject: [PATCH 2/3] Update kubelet-integration.md --- .../tools/kubeadm/kubelet-integration.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md b/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md index e3ab1395a2..c11b8cc0a0 100644 --- a/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md +++ b/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md @@ -161,6 +161,12 @@ Kubeadm deletes the `/etc/kubernetes/bootstrap-kubelet.conf` file after completi `kubeadm` ships with configuration for how systemd should run the kubelet. Note that the kubeadm CLI command never touches this drop-in file. +{{< note >}} +The contents below are just an example. If you don't want to use a package manager +follow the guide outlined in the [Without a package manager](/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#k8s-install-2)) +section. +{{< /note >}} + This configuration file installed by the `kubeadm` [DEB](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf) or [RPM package](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/rpm/kubeadm/10-kubeadm.conf) is written to From 3d392f1b514c7de2d9e7d312487b937544c67d69 Mon Sep 17 00:00:00 2001 From: PriyanshuAhlawat Date: Mon, 28 Feb 2022 23:03:31 +0530 Subject: [PATCH 3/3] Update kubelet-integration.md --- .../tools/kubeadm/kubelet-integration.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md b/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md index c11b8cc0a0..59477d944f 100644 --- a/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md +++ b/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md @@ -161,12 +161,6 @@ Kubeadm deletes the `/etc/kubernetes/bootstrap-kubelet.conf` file after completi `kubeadm` ships with configuration for how systemd should run the kubelet. Note that the kubeadm CLI command never touches this drop-in file. -{{< note >}} -The contents below are just an example. If you don't want to use a package manager -follow the guide outlined in the [Without a package manager](/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#k8s-install-2)) -section. -{{< /note >}} - This configuration file installed by the `kubeadm` [DEB](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf) or [RPM package](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/rpm/kubeadm/10-kubeadm.conf) is written to @@ -175,6 +169,12 @@ It augments the basic [`kubelet.service` for RPM](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/rpm/kubelet/kubelet.service) or [`kubelet.service` for DEB](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service): +{{< note >}} +The contents below are just an example. If you don't want to use a package manager +follow the guide outlined in the [Without a package manager](/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#k8s-install-2)) +section. +{{< /note >}} + ```none [Service] Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"