Remove kubelet_node_{custom_flags,config_extra_args}

There is no need to have an extra variables for this, just use different
values per host (using Ansible group_vars, for example)
pull/10643/head
Max Gautier 2023-11-23 21:13:55 +01:00
parent 1bc61c9f35
commit fe60832a02
No known key found for this signature in database
4 changed files with 3 additions and 16 deletions

View File

@ -296,8 +296,8 @@ node_taints:
For all kube components, custom flags can be passed in. This allows for edge cases where users need changes to the default deployment that may not be applicable to all deployments. For all kube components, custom flags can be passed in. This allows for edge cases where users need changes to the default deployment that may not be applicable to all deployments.
Extra flags for the kubelet can be specified using these variables, Extra flags for the kubelet can be specified using these variables, in the form of dicts of key-value pairs of
in the form of dicts of key-value pairs of configuration parameters that will be inserted into the kubelet YAML config file. The `kubelet_node_config_extra_args` apply kubelet settings only to nodes and not control planes. Example: configuration parameters that will be inserted into the kubelet YAML config file. Example:
```yml ```yml
kubelet_config_extra_args: kubelet_config_extra_args:
@ -312,14 +312,10 @@ kubelet_config_extra_args:
The possible vars are: The possible vars are:
* *kubelet_config_extra_args* * *kubelet_config_extra_args*
* *kubelet_node_config_extra_args*
Previously, the same parameters could be passed as flags to kubelet binary with the following vars: Previously, the same parameters could be passed as flags to kubelet binary with the following vars:
* *kubelet_custom_flags* * *kubelet_custom_flags*
* *kubelet_node_custom_flags*
The `kubelet_node_custom_flags` apply kubelet settings only to nodes and not control planes. Example:
```yml ```yml
kubelet_custom_flags: kubelet_custom_flags:

View File

@ -125,9 +125,6 @@ kubelet_config_extra_args_cgroupfs:
systemCgroups: /system.slice systemCgroups: /system.slice
cgroupRoot: / cgroupRoot: /
## Support parameters to be passed to kubelet via kubelet-config.yaml only on nodes, not control plane nodes
kubelet_node_config_extra_args: {}
# Maximum number of container log files that can be present for a container. # Maximum number of container log files that can be present for a container.
kubelet_logfiles_max_nr: 5 kubelet_logfiles_max_nr: 5
@ -137,9 +134,6 @@ kubelet_logfiles_max_size: 10Mi
## Support custom flags to be passed to kubelet ## Support custom flags to be passed to kubelet
kubelet_custom_flags: [] kubelet_custom_flags: []
## Support custom flags to be passed to kubelet only on nodes, not control plane nodes
kubelet_node_custom_flags: []
# If non-empty, will use this string as identification instead of the actual hostname # If non-empty, will use this string as identification instead of the actual hostname
kube_override_hostname: >- kube_override_hostname: >-
{%- if cloud_provider is defined and cloud_provider in ['aws'] -%} {%- if cloud_provider is defined and cloud_provider in ['aws'] -%}

View File

@ -77,9 +77,6 @@ resolvConf: "{{ kube_resolv_conf }}"
{% if kubelet_config_extra_args %} {% if kubelet_config_extra_args %}
{{ kubelet_config_extra_args | to_nice_yaml(indent=2) }} {{ kubelet_config_extra_args | to_nice_yaml(indent=2) }}
{% endif %} {% endif %}
{% if inventory_hostname in groups['kube_node'] and kubelet_node_config_extra_args %}
{{ kubelet_node_config_extra_args | to_nice_yaml(indent=2) }}
{% endif %}
{% if kubelet_feature_gates or kube_feature_gates %} {% if kubelet_feature_gates or kube_feature_gates %}
featureGates: featureGates:
{% for feature in (kubelet_feature_gates | default(kube_feature_gates, true)) %} {% for feature in (kubelet_feature_gates | default(kube_feature_gates, true)) %}

View File

@ -15,7 +15,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
--runtime-cgroups={{ kubelet_runtime_cgroups }} \ --runtime-cgroups={{ kubelet_runtime_cgroups }} \
{% endset %} {% endset %}
KUBELET_ARGS="{{ kubelet_args_base }} {% if kubelet_custom_flags is string %} {{kubelet_custom_flags}} {% else %}{% for flag in kubelet_custom_flags %} {{flag}} {% endfor %}{% endif %}{% if inventory_hostname in groups['kube_node'] %}{% if kubelet_node_custom_flags is string %} {{kubelet_node_custom_flags}} {% else %}{% for flag in kubelet_node_custom_flags %} {{flag}} {% endfor %}{% endif %}{% endif %}" KUBELET_ARGS="{{ kubelet_args_base }} {{ kubelet_custom_flags | join(' ') }}"
{% if kubelet_flexvolumes_plugins_dir is defined %} {% if kubelet_flexvolumes_plugins_dir is defined %}
KUBELET_VOLUME_PLUGIN="--volume-plugin-dir={{ kubelet_flexvolumes_plugins_dir }}" KUBELET_VOLUME_PLUGIN="--volume-plugin-dir={{ kubelet_flexvolumes_plugins_dir }}"
{% endif %} {% endif %}