github.com/noironetworks/cilium-net@v1.6.12/contrib/flannel/run-flannel.diff (about)

     1  diff --git a/contrib/vagrant/start.sh b/contrib/vagrant/start.sh
     2  index 15def2284..f6a4f43f6 100755
     3  --- a/contrib/vagrant/start.sh
     4  +++ b/contrib/vagrant/start.sh
     5  @@ -42,7 +42,7 @@ export 'VM_BASENAME'=${K8S+"k8s"}
     6   # Set VAGRANT_DEFAULT_PROVIDER to virtualbox
     7   export 'VAGRANT_DEFAULT_PROVIDER'=${VAGRANT_DEFAULT_PROVIDER:-"virtualbox"}
     8   # Sets the default cilium TUNNEL_MODE to "vxlan"
     9  -export 'TUNNEL_MODE_STRING'=${TUNNEL_MODE_STRING:-"-t vxlan"}
    10  +export 'TUNNEL_MODE_STRING'=${TUNNEL_MODE_STRING:-"-t disabled"}
    11   # Replies Yes to all prompts asked in this script
    12   export 'YES_TO_ALL'=${YES_TO_ALL:-"0"}
    13   
    14  @@ -203,8 +203,8 @@ function write_k8s_install() {
    15           k8s_cluster_api_server_ip="FD03::1"
    16           k8s_cluster_dns_ip="FD03::A"
    17       fi
    18  -    k8s_cluster_cidr=${k8s_cluster_cidr:-"10.16.0.0/12"}
    19  -    k8s_node_cidr_mask_size=${k8s_node_cidr_mask_size:-"16"}
    20  +    k8s_cluster_cidr=${k8s_cluster_cidr:-"10.244.0.0/16"}
    21  +    k8s_node_cidr_mask_size=${k8s_node_cidr_mask_size:-"24"}
    22       k8s_service_cluster_ip_range=${k8s_service_cluster_ip_range:-"172.20.0.0/24"}
    23       k8s_cluster_api_server_ip=${k8s_cluster_api_server_ip:-"172.20.0.1"}
    24       k8s_cluster_dns_ip=${k8s_cluster_dns_ip:-"172.20.0.10"}
    25  @@ -278,7 +278,7 @@ function write_cilium_cfg() {
    26       ipv6_addr="${3}"
    27       filename="${4}"
    28   
    29  -    cilium_options="--auto-direct-node-routes"
    30  +    cilium_options="--flannel-master-device=cni0 --auto-direct-node-routes"
    31   
    32       if [[ "${IPV4}" -eq "1" ]]; then
    33           if [[ -z "${K8S}" ]]; then
    34  diff --git a/examples/kubernetes-ingress/scripts/helpers.bash b/examples/kubernetes-ingress/scripts/helpers.bash
    35  index bdec39577..5cbcc2d87 100644
    36  --- a/examples/kubernetes-ingress/scripts/helpers.bash
    37  +++ b/examples/kubernetes-ingress/scripts/helpers.bash
    38  @@ -55,9 +55,9 @@ kubernetes_master="${controllers_ips[0]}"
    39   # Default values for IPv4
    40   #
    41   # CIDR Range for Pods in cluster.
    42  -k8s_cluster_cidr=${K8S_CLUSTER_CIDR:-"10.16.0.0/12"} # 10.16.0.1-10.31.255.255
    43  +k8s_cluster_cidr=${K8S_CLUSTER_CIDR:-"10.244.0.0/16"} # 10.16.0.1-10.31.255.255
    44   # Mask size for node cidr in cluster.
    45  -k8s_node_cidr_mask_size=${K8S_NODE_CIDR_MASK_SIZE:-"16"} # 1st Node: 10.16.0.1-10.16.255.254, 2nd Node: 10.17.0.1-10.17.255.254...
    46  +k8s_node_cidr_mask_size=${K8S_NODE_CIDR_MASK_SIZE:-"24"} # 1st Node: 10.16.0.1-10.16.255.254, 2nd Node: 10.17.0.1-10.17.255.254...
    47   # CIDR Range for Services in cluster.
    48   k8s_service_cluster_ip_range=${K8S_SERVICE_CLUSTER_IP_RANGE:-"172.20.0.0/24"}
    49   cluster_dns_ip=${K8S_CLUSTER_DNS_IP:-"172.20.0.10"}
    50  diff --git a/plugins/cilium-cni/Makefile b/plugins/cilium-cni/Makefile
    51  index 166a8fa98..a6ff6059b 100644
    52  --- a/plugins/cilium-cni/Makefile
    53  +++ b/plugins/cilium-cni/Makefile
    54  @@ -18,6 +18,6 @@ $(TARGET): $(SOURCES)
    55   
    56   install:
    57   	$(INSTALL) -m 0755 -d $(DESTDIR)$(CNICONFDIR)
    58  -	$(INSTALL) -m 0644 05-cilium-cni.conf $(DESTDIR)$(CNICONFDIR)
    59  +	$(INSTALL) -m 0644 04-flannel-cilium-cni.conflist $(DESTDIR)$(CNICONFDIR)
    60   	$(INSTALL) -m 0755 -d $(DESTDIR)$(CNIBINDIR)
    61   	$(INSTALL) -m 0755 $(TARGET) $(DESTDIR)$(CNIBINDIR)
    62  diff --git a/test/provision/wait-cilium.sh b/test/provision/wait-cilium.sh
    63  index e9d396a3c..07136746f 100755
    64  --- a/test/provision/wait-cilium.sh
    65  +++ b/test/provision/wait-cilium.sh
    66  @@ -2,16 +2,10 @@
    67   
    68   main() {
    69       local cilium_started
    70  -    cilium_started=false
    71   
    72  -    for ((i = 0 ; i < 24; i++)); do
    73  -        if cilium status --brief > /dev/null 2>&1; then
    74  -            cilium_started=true
    75  -            break
    76  -        fi
    77  -        sleep 5s
    78  -        echo "Waiting for Cilium daemon to come up..."
    79  -    done
    80  +    cilium_started=true
    81  +    echo "As Cilium is running in visibility-mode we can't wait for it to start"
    82  +    echo "as it might be waiting for cni0 to be created."
    83   
    84       if [ "$cilium_started" = true ] ; then
    85           echo 'Cilium successfully started!'