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

* 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

View File

@@ -33,7 +33,7 @@ instance-2
[etcd]
instance-1
{% elif mode == "aio" %}
{% elif mode == "all-in-one" %}
[kube_control_plane]
instance-1
@@ -81,6 +81,16 @@ instance-2
[broken_etcd]
instance-1 etcd_member_name=etcd2
instance-2 etcd_member_name=etcd3
{% elif mode == "multinode" %}
[kube_control_plane]
instance-1
[etcd]
instance-1
[kube_node]
instance-2
instance-3
{% endif %}
[k8s_cluster:children]