From 1c20e20dec936c25709c8b8443200b57c165b9f6 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 16 Nov 2022 20:51:03 +0100 Subject: [PATCH] feat: add option to control the k3s cloud controller --- defaults/main.yml | 1 + templates/_internal/kubelet-arg.yaml.j2 | 3 +++ templates/etc/rancher/k3s/config.yaml.j2 | 3 +++ 3 files changed, 7 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 284affc..9cc07c8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -21,6 +21,7 @@ k3s_server_nodes: - "{{ ansible_hostname }}" k3s_server_flannel_backend_enabled: True k3s_server_network_policy_enabled: True +k3s_server_cloud_controller_enabled: True k3s_server_feature_gates: [] k3s_server_manifests_templates: [] diff --git a/templates/_internal/kubelet-arg.yaml.j2 b/templates/_internal/kubelet-arg.yaml.j2 index d758896..cf6aa79 100644 --- a/templates/_internal/kubelet-arg.yaml.j2 +++ b/templates/_internal/kubelet-arg.yaml.j2 @@ -1,2 +1,5 @@ #jinja2: lstrip_blocks: True - config={{ __k3s_config_dir }}/kubelet.yaml +{% if not k3s_server_cloud_controller_enabled | bool %} +- cloud-provider=external +{% endif %} diff --git a/templates/etc/rancher/k3s/config.yaml.j2 b/templates/etc/rancher/k3s/config.yaml.j2 index a205217..b7de482 100644 --- a/templates/etc/rancher/k3s/config.yaml.j2 +++ b/templates/etc/rancher/k3s/config.yaml.j2 @@ -24,6 +24,9 @@ kube-apiserver-arg: {% if not k3s_server_flannel_backend_enabled | bool %} flannel-backend: "none" {% endif %} +{% if not k3s_server_cloud_controller_enabled | bool %} +disable-cloud-controller: true +{% endif %} {% if not k3s_server_network_policy_enabled | bool %} disable-network-policy: True {% endif %}