External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-20 02:17:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

[2.23] Fix calico-node in etcd mode (#10768)

Browse Source 
* CI: Document the 'all-in-one' layout + small refactoring (#10725)

* Rename aio to all-in-one and document it

ADTM.
Acronyms don't tell much.

* Refactor vm_count in tests provisioning

* Add test case for calico using etcd datastore (#10722)

* Add multinode ci layout

* Add test case for calico using etcd datastore

* Fix calico-node in etcd mode (#10438)

* Calico : add ETCD endpoints to install-cni container

* Calico : remove nodename from configmap in etcd mode

---------

Co-authored-by: Olivier Levitt <olivier.levitt@gmail.com>
This commit is contained in:
Max Gautier
2024-01-12 04:11:00 +01:00
committed by GitHub
parent 20a9e20c5a
commit 3d76c30354
19 changed files with 88 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/templates/inventory-gce.j2
View File

@@ -1,6 +1,6 @@
{% set node1 = gce.instance_data[0].name %}
{{node1}} ansible_ssh_host={{gce.instance_data[0].public_ip}}
{% if mode != "aio" %}
{% if mode != "all-in-one" %}
{% set node2 = gce.instance_data[1].name %}
{{node2}} ansible_ssh_host={{gce.instance_data[1].public_ip}}
{% endif %}
@@ -46,7 +46,7 @@
[etcd]
{{node1}}
{% elif mode == "aio" %}
{% elif mode == "all-in-one" %}
[kube_control_plane]
{{node1}}