Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert https://github.com/lablabs/ansible-role-rke2/pull/273 #278

Merged
merged 2 commits into from
Nov 28, 2024
Merged

Revert https://github.com/lablabs/ansible-role-rke2/pull/273 #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0b689a
Revert https://github.com/lablabs/ansible-role-rke2/pull/273
Raboo Nov 27, 2024
5bdd4fd
Give the option to disable cloud-provider-name,
Raboo Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions templates/config.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) %}
Expand Down
Loading