whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update kubeletconfig docs for v1.10, beta (#7561)

Browse Source
This commit is contained in:
Michael Taufen
2018-03-03 11:50:53 -08:00
committed by zacharysarah
parent 8a93b31655
commit 9e96858424
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/tasks/administer-cluster/kubelet-config-file.md
+22
View File
@@ -51,6 +51,7 @@ For a trick to generate a configuration file from a live node, see
## Start a Kubelet process configured via the config file ## Start a Kubelet process configured via the config file
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
Start the Kubelet with the `--config` flag set to the path of the Kubelet's config file. Start the Kubelet with the `--config` flag set to the path of the Kubelet's config file.
The Kubelet will then load its config from this file. The Kubelet will then load its config from this file.
@@ -78,6 +79,27 @@ containing the `kubelet` file. The Kubelet will then load the parameters defined
by `KubeletConfiguration` from the `kubelet` file, rather than from their by `KubeletConfiguration` from the `kubelet` file, rather than from their
associated command-line flags. associated command-line flags.
>>>>>>> Document the removal of the KubeletConfigFile feature gate (#7140) >>>>>>> Document the removal of the KubeletConfigFile feature gate (#7140)
||||||| merged common ancestors
Start the Kubelet with the `--init-config-dir` flag set to the location of the directory
containing the `kubelet` file. The Kubelet will then load the parameters defined
by `KubeletConfiguration` from the `kubelet` file, rather than from their
associated command-line flags.
=======
Start the Kubelet with the `--config` flag set to the path of the Kubelet's config file.
The Kubelet will then load its config from this file.
Note that command line flags which target the same value as a config file will override that value.
This helps ensure backwards compatibility with the command-line API.
Note that relative file paths in the Kubelet config file are resolved relative to the
location of the Kubelet config file, whereas relative paths in command line flags are resolved
relative to the Kubelet's current working directory.
Note that some default values differ between command-line flags and the Kubelet config file.
If `--config` is provided and the values are not specified via the command line, the
defaults for the `KubeletConfiguration` version apply.
In the above example, this version is `kubelet.config.k8s.io/v1beta1`.
>>>>>>> update kubeletconfig docs for v1.10, beta (#7561)
{% endcapture %} {% endcapture %}
docs/tasks/administer-cluster/reconfigure-kubelet.md
+6
View File
@@ -112,7 +112,13 @@ configz endpoint:
``` ```
$ export NODE_NAME=the-name-of-the-node-you-are-reconfiguring $ export NODE_NAME=the-name-of-the-node-you-are-reconfiguring
<<<<<<< HEAD
$ curl -sSL http://localhost:8001/api/v1/nodes/${NODE_NAME}/proxy/configz | jq '.kubeletconfig|.kind="KubeletConfiguration"|.apiVersion="kubelet.config.k8s.io/v1beta1"' > kubelet_configz_${NODE_NAME} $ curl -sSL http://localhost:8001/api/v1/nodes/${NODE_NAME}/proxy/configz | jq '.kubeletconfig|.kind="KubeletConfiguration"|.apiVersion="kubelet.config.k8s.io/v1beta1"' > kubelet_configz_${NODE_NAME}
||||||| merged common ancestors
$ curl -sSL http://localhost:8001/api/v1/proxy/nodes/${NODE_NAME}/configz | jq '.kubeletconfig|.kind="KubeletConfiguration"|.apiVersion="kubeletconfig/v1alpha1"' > kubelet_configz_${NODE_NAME}
=======
$ curl -sSL http://localhost:8001/api/v1/proxy/nodes/${NODE_NAME}/configz | jq '.kubeletconfig|.kind="KubeletConfiguration"|.apiVersion="kubelet.config.k8s.io/v1beta1"' > kubelet_configz_${NODE_NAME}
>>>>>>> update kubeletconfig docs for v1.10, beta (#7561)
``` ```
Note that we have to manually add the `kind` and `apiVersion` to the downloaded Note that we have to manually add the `kind` and `apiVersion` to the downloaded