Merge pull request #278 from Raboo/patch-1

Revert #273

Author: MonolithProjects

README.md

@@ -189,8 +189,9 @@ disable_kube_proxy: false
 # Option to disable builtin cloud controller - mostly for onprem
 rke2_disable_cloud_controller: false
 
-# Cloud provider to use for the cluster (aws, azure, gce, openstack, vsphere, external)
+# Cloud provider to use for the cluster (aws, azure, gce, harvester, rancher-vsphere, openstack, vsphere, external)
 # applicable only if rke2_disable_cloud_controller is true
+# Can be set to false to disable setting it in the configuration file
 rke2_cloud_provider_name: "external"
 
 # Path to custom manifests deployed during the RKE2 installation

templates/config.yaml.j2

@@ -91,10 +91,10 @@ kube-proxy-arg:
 {% endif %}
 {% if (rke2_disable_cloud_controller | bool ) %}
 disable-cloud-controller: true
-{% endif %}
-{% if not (rke2_disable_cloud_controller | bool ) %}
+{% if rke2_cloud_provider_name != false %}
 cloud-provider-name: "{{ rke2_cloud_provider_name }}"
 {% endif %}
+{% endif %}
 cluster-cidr: "{% for network in rke2_cluster_cidr %}{{ network }}{% if not loop['last'] %},{% endif %}{% endfor %}"
 service-cidr: "{% for network in rke2_service_cidr %}{{ network }}{% if not loop['last'] %},{% endif %}{% endfor %}"
 {% if (rke2_selinux | bool ) %}