[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>

roles/network_plugin/calico/templates/calico-config.yml.j2

@@ -36,12 +36,6 @@ data:
           {% if calico_datastore == "kdd" %}
             "datastore_type": "kubernetes",
             "nodename": "__KUBERNETES_NODE_NAME__",
-          {% else %}
-          {% if cloud_provider is defined %}
-            "nodename": "{{ calico_kubelet_name.stdout }}",
-            {% else %}
-            "nodename": "{{ calico_baremetal_nodename }}",
-          {% endif %}
           {% endif %}
             "type": "calico",
             "log_level": "info",

roles/network_plugin/calico/templates/calico-node.yml.j2

@@ -95,6 +95,13 @@ spec:
             # Prevents the container from sleeping forever.
             - name: SLEEP
               value: "false"
+{% if calico_datastore == "etcd" %}
+            - name: ETCD_ENDPOINTS
+              valueFrom:
+                configMapKeyRef:
+                  name: calico-config
+                  key: etcd_endpoints
+{% endif %}
 {% if calico_datastore == "kdd" %}
             # Set the hostname based on the k8s node name.
             - name: KUBERNETES_NODE_NAME