diff --git a/.drone.yml b/.drone.yml index 833f690..bafaab3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -type: kubernetes +type: docker name: default steps: diff --git a/bin/update.sh b/bin/update.sh index 2601439..c6c0d52 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -13,8 +13,4 @@ sed "$line_nb,$[$line_nb+1] s/# //" -i files/calico-node-DaemonSet.yaml # Switch to VxLan sed "/calico_backend:/ s/bird/vxlan/" -i files/calico-config-ConfigMap.yaml -line_nb=$(grep -n CALICO_IPV4POOL_IPIP files/calico-node-DaemonSet.yaml | cut -d: -f1) -sed "$line_nb,$[$line_nb+1] s/\(value: \).*/\1\"Never\"/" -i files/calico-node-DaemonSet.yaml -line_nb=$(grep -n CALICO_IPV4POOL_VXLAN files/calico-node-DaemonSet.yaml | cut -d: -f1) -sed "$line_nb,$[$line_nb+1] s/\(value: \).*/\1\"Always\"/" -i files/calico-node-DaemonSet.yaml -sed "/-bird-/ s/\(- -bird-.*\)/# \1/" -i files/calico-node-DaemonSet.yaml +sed -e "s/IPIP$/VXLAN/" -e "/-bird-/ s/\(- -bird-.*\)/# \1/" -i files/calico-node-DaemonSet.yaml diff --git a/files/calico-node-DaemonSet.yaml b/files/calico-node-DaemonSet.yaml index 1db25aa..c129ca3 100644 --- a/files/calico-node-DaemonSet.yaml +++ b/files/calico-node-DaemonSet.yaml @@ -144,12 +144,12 @@ spec: # Auto-detect the BGP IP address. - name: IP value: "autodetect" - # Enable IPIP - - name: CALICO_IPV4POOL_IPIP - value: "Never" - # Enable or Disable VXLAN on the default IP pool. + # Enable VXLAN - name: CALICO_IPV4POOL_VXLAN value: "Always" + # Enable or Disable VXLAN on the default IP pool. + - name: CALICO_IPV4POOL_VXLAN + value: "Never" # Set MTU for tunnel device used if ipip is enabled - name: FELIX_IPINIPMTU valueFrom: