diff --git a/README.md b/README.md index a4018e5..8126133 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ kubernetes_config_kubelet_configuration: cgroupDriver: systemd ``` -Options to configure kubelet on any nodes in your cluster through the `kubeadm init` process. To get the syntax of this options see https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file and https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/kubelet-integration. +Options to configure kubelet on any nodes in your cluster through the `kubeadm init` process. For syntax options read the [kubelet config file](https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file) and [kubelet integration](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/kubelet-integration) documentation. NOTE: This is the recommended way to do the kubelet-configuration. Most command-line-options are deprecated. @@ -92,7 +92,7 @@ kubernetes_kubelet_extra_args: "" kubernetes_kubelet_extra_args_config_file: /etc/default/kubelet ``` -Extra args to pass to `kubelet` during startup. E.g. to allow `kubelet` to start up even if there is swap is enabled on your server, set this to: `"--fail-swap-on=false"`. Or to specify the node-ip advertised by `kubelet`, set this to `"--node-ip={{ ansible_host }}"`. *This is deprecated. Please use `kubernetes_config_kubelet_configuration` instead.* +Extra args to pass to `kubelet` during startup. E.g. to allow `kubelet` to start up even if there is swap is enabled on your server, set this to: `"--fail-swap-on=false"`. Or to specify the node-ip advertised by `kubelet`, set this to `"--node-ip={{ ansible_host }}"`. **This option is deprecated. Please use `kubernetes_config_kubelet_configuration` instead.** ```yaml kubernetes_kubeadm_init_extra_opts: "" diff --git a/molecule/default/calico.yml b/molecule/default/calico.yml index cd86eca..b2060ba 100644 --- a/molecule/default/calico.yml +++ b/molecule/default/calico.yml @@ -9,11 +9,11 @@ cidr: '192.168.0.0/16' # Allow swap in test environments (hard to control in some envs). - kubernetes_kubelet_extra_args: >- - --fail-swap-on=false - --cgroup-driver=systemd - --cgroups-per-qos=false - --enforce-node-allocatable="" + kubernetes_config_kubelet_configuration: + cgroupDriver: "systemd" + failSwapOn: false + cgroupsPerQOS: false + enforceNodeAllocatable: "" containerd_config_cgroup_driver_systemd: true pre_tasks: diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 45a38fc..248ed37 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -5,11 +5,11 @@ vars: # Allow swap in test environments (hard to control in some envs). - kubernetes_kubelet_extra_args: >- - --fail-swap-on=false - --cgroup-driver=systemd - --cgroups-per-qos=false - --enforce-node-allocatable="" + kubernetes_config_kubelet_configuration: + cgroupDriver: "systemd" + failSwapOn: false + cgroupsPerQOS: false + enforceNodeAllocatable: "" containerd_config_cgroup_driver_systemd: true pre_tasks: