mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-28 09:39:12 +03:00
[calico] don't enable ipip encapsulation by default and use vxlan in CI (#8434)
* [calico] make vxlan encapsulation the default * don't enable ipip encapsulation by default * set calico_network_backend by default to vxlan * update sample inventory and documentation * [CI] pin default calico parameters for upgrade tests to ensure proper upgrade * [CI] improve netchecker connectivity testing * [CI] show logs for tests * [calico] tweak task name * [CI] Don't run the provisioner from vagrant since we run it in testcases_run.sh * [CI] move kube-router tests to vagrant to avoid network connectivity issues during netchecker check * service proxy mode still fails connectivity tests so keeping it manual mode * [kube-router] account for containerd use-case
This commit is contained in:
@@ -62,6 +62,14 @@ spec:
|
||||
- --metrics-path={{ kube_router_metrics_path }}
|
||||
- --metrics-port={{ kube_router_metrics_port }}
|
||||
{% endif %}
|
||||
{% if kube_router_enable_dsr %}
|
||||
{% if container_manager == "docker" %}
|
||||
- --runtime-endpoint=unix:///var/run/docker.sock
|
||||
{% endif %}
|
||||
{% if container_manager == "containerd" %}
|
||||
{% endif %}
|
||||
- --runtime-endpoint=unix:///run/containerd/containerd.sock
|
||||
{% endif %}
|
||||
{% for arg in kube_router_extra_args %}
|
||||
- "{{ arg }}"
|
||||
{% endfor %}
|
||||
@@ -86,9 +94,16 @@ spec:
|
||||
privileged: true
|
||||
volumeMounts:
|
||||
{% if kube_router_enable_dsr %}
|
||||
{% if container_manager == "docker" %}
|
||||
- name: docker-socket
|
||||
mountPath: /var/run/docker.sock
|
||||
readOnly: true
|
||||
{% endif %}
|
||||
{% if container_manager == "containerd" %}
|
||||
- name: containerd-socket
|
||||
mountPath: /run/containerd/containerd.sock
|
||||
readOnly: true
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
- name: lib-modules
|
||||
mountPath: /lib/modules
|
||||
@@ -118,10 +133,18 @@ spec:
|
||||
- operator: Exists
|
||||
volumes:
|
||||
{% if kube_router_enable_dsr %}
|
||||
{% if container_manager == "docker" %}
|
||||
- name: docker-socket
|
||||
hostPath:
|
||||
path: /var/run/docker.sock
|
||||
type: Socket
|
||||
{% endif %}
|
||||
{% if container_manager == "containerd" %}
|
||||
- name: containerd-socket
|
||||
hostPath:
|
||||
path: /run/containerd/containerd.sock
|
||||
type: Socket
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
- name: lib-modules
|
||||
hostPath:
|
||||
|
||||
Reference in New Issue
Block a user