mirror of https://github.com/k3s-io/k3s
1085b6f730
- Changes the following KubeletConfiguration fields from `string` to `map[string]string`: - `EvictionHard` - `EvictionSoft` - `EvictionSoftGracePeriod` - `EvictionMinimumReclaim` - Adds flag parsing shims to maintain Kubelet's public flags API, while enabling structured input in the file API. - Also removes `kubeletconfig.ConfigurationMap`, which was an ad-hoc flag parsing shim living in the kubeletconfig API group, and replaces it with the `MapStringString` shim introduced in this PR. Flag parsing shims belong in a common place, not in the kubeletconfig API. I manually audited these to ensure that this wouldn't cause errors parsing the command line for syntax that would have previously been error free (`kubeletconfig.ConfigurationMap` was unique in that it allowed keys to be provided on the CLI without values. I believe this was done in `flags.ConfigurationMap` to facilitate the `--node-labels` flag, which rightfully accepts value-free keys, and that this shim was then just copied to `kubeletconfig`). Fortunately, the affected fields (`ExperimentalQOSReserved`, `SystemReserved`, and `KubeReserved`) expect non-empty strings in the values of the map, and as a result passing the empty string is already an error. Thus requiring keys shouldn't break anyone's scripts. - Updates code and tests accordingly. Regarding eviction operators, directionality is already implicit in the signal type (for a given signal, the decision to evict will be made when crossing the threshold from either above or below, never both). There is no need to expose an operator, such as `<`, in the API. By changing `EvictionHard` and `EvictionSoft` to `map[string]string`, this PR simplifies the experience of working with these fields via the `KubeletConfiguration` type. Again, flags stay the same. Other things: - There is another flag parsing shim, `flags.ConfigurationMap`, from the shared flag utility. The `NodeLabels` field still uses `flags.ConfigurationMap`. This PR moves the allocation of the `map[string]string` for the `NodeLabels` field from `AddKubeletConfigFlags` to the defaulter for the external `KubeletConfiguration` type. Flags are layered on top of an internal object that has undergone conversion from a defaulted external object, which means that previously the mere registration of flags would have overwritten any previously-defined defaults for `NodeLabels` (fortunately there were none). |
||
|---|---|---|
| .. | ||
| builder | ||
| conformance | ||
| environment | ||
| jenkins | ||
| perftype | ||
| remote | ||
| runner | ||
| services | ||
| system | ||
| BUILD | ||
| OWNERS | ||
| README.md | ||
| apparmor_test.go | ||
| benchmark_util.go | ||
| container.go | ||
| container_manager_test.go | ||
| cpu_manager_test.go | ||
| critical_pod_test.go | ||
| density_test.go | ||
| doc.go | ||
| docker_test.go | ||
| docker_util.go | ||
| dockershim_checkpoint_test.go | ||
| dynamic_kubelet_config_test.go | ||
| e2e_node_suite_test.go | ||
| eviction_test.go | ||
| garbage_collector_test.go | ||
| gke_environment_test.go | ||
| gpu_device_plugin.go | ||
| gpus.go | ||
| gubernator.sh | ||
| image_id_test.go | ||
| image_list.go | ||
| kubelet_test.go | ||
| lifecycle_hook_test.go | ||
| log_path_test.go | ||
| memory_eviction_test.go | ||
| mirror_pod_test.go | ||
| node_container_manager_test.go | ||
| node_problem_detector_linux.go | ||
| pods_container_manager_test.go | ||
| resource_collector.go | ||
| resource_usage_test.go | ||
| restart_test.go | ||
| runtime_conformance_test.go | ||
| security_context_test.go | ||
| simple_mount.go | ||
| summary_test.go | ||
| util.go | ||
| volume_manager_test.go | ||
README.md
See e2e-node-tests