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

Document the removal of the KubeletConfigFile feature gate (#7140)

Browse Source 
With kubernetes/kubernetes#58978 merged, the said feature gate is
removed. This PR removes texts related to the gate and revises the
Feature Gates reference to reflect this change.
This commit is contained in:
Qiming
2018-02-08 05:50:43 +08:00
committed by zacharysarah
parent 5aae8f887d
commit 2335fc163f
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/reference/feature-gates.md
+8
View File
@@ -61,9 +61,17 @@ different Kubernetes components.
| `HugePages` | `true` | Beta| 1.10 | |
| `HyperVContainer` | `false` | Alpha | 1.10 | |
| `Initializers` | `false` | Alpha | 1.7 | |
<<<<<<< HEAD
| `KubeletConfigFile` | `false` | Alpha | 1.8 | 1.9 |
| `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | 1.9 |
| `LocalStorageCapacityIsolation` | `true` | Beta| 1.10 | |
||||||| merged common ancestors
| `KubeletConfigFile` | `false` | Alpha | 1.8 | |
| `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | |
=======
| `KubeletConfigFile` | `false` | Alpha | 1.8 | 1.9 |
| `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | |
>>>>>>> Document the removal of the KubeletConfigFile feature gate (#7140)
| `MountContainers` | `false` | Alpha | 1.9 | |
| `MountPropagation` | `false` | Alpha | 1.8 | 1.9 |
| `MountPropagation` | `true` | Beta | 1.10 | |
docs/tasks/administer-cluster/kubelet-config-file.md
+13
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
<<<<<<< HEAD
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.
@@ -65,6 +66,18 @@ Note that some default values differ between command-line flags and the Kubelet
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`.
||||||| merged common ancestors
Start the Kubelet with the `KubeletConfigFile` feature gate enabled and the
Kubelet's `--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 `--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.
>>>>>>> Document the removal of the KubeletConfigFile feature gate (#7140)
{% endcapture %}