mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-05-12 03:47:38 -02:30
Calico: fix peering with routers for new version
In new `calicoctl` version nodes peering with routers is broken. We need to use predictable node names for calico-node and the same names in calico `bgpPeer` resources and CNI.
This commit is contained in:
@@ -8,6 +8,7 @@ EnvironmentFile=/etc/calico/calico.env
|
||||
ExecStartPre=-/usr/bin/docker rm -f calico-node
|
||||
ExecStart=/usr/bin/docker run --net=host --privileged \
|
||||
--name=calico-node \
|
||||
-e HOSTNAME=${CALICO_HOSTNAME} \
|
||||
-e IP=${CALICO_IP} \
|
||||
-e IP6=${CALICO_IP6} \
|
||||
-e CALICO_NETWORKING_BACKEND=${CALICO_NETWORKING_BACKEND} \
|
||||
|
||||
@@ -12,3 +12,4 @@ CALICO_AS="{{ local_as }}"
|
||||
{% endif %}
|
||||
CALICO_NO_DEFAULT_POOLS="true"
|
||||
CALICO_LIBNETWORK_ENABLED="true"
|
||||
CALICO_HOSTNAME="{{ inventory_hostname }}"
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"name": "calico-k8s-network",
|
||||
"hostname": "{{ inventory_hostname }}",
|
||||
"type": "calico",
|
||||
"etcd_endpoints": "{{ etcd_access_endpoint }}",
|
||||
"etcd_cert_file": "{{ etcd_cert_dir }}/node.pem",
|
||||
|
||||
Reference in New Issue
Block a user