Compare commits

..

No commits in common. "67a6dbb863515adfa4938d3f70e7c40df3c0b976" and "85b8d2e4dde34d6f18a606e559a170c66e4eeea4" have entirely different histories.

3 changed files with 6 additions and 10 deletions

View file

@ -1,6 +1,6 @@
--- ---
kind: pipeline kind: pipeline
type: kubernetes type: docker
name: default name: default
steps: steps:

View file

@ -13,8 +13,4 @@ sed "$line_nb,$[$line_nb+1] s/# //" -i files/calico-node-DaemonSet.yaml
# Switch to VxLan # Switch to VxLan
sed "/calico_backend:/ s/bird/vxlan/" -i files/calico-config-ConfigMap.yaml 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 -e "s/IPIP$/VXLAN/" -e "/-bird-/ s/\(- -bird-.*\)/# \1/" -i files/calico-node-DaemonSet.yaml
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

View file

@ -144,12 +144,12 @@ spec:
# Auto-detect the BGP IP address. # Auto-detect the BGP IP address.
- name: IP - name: IP
value: "autodetect" value: "autodetect"
# Enable IPIP # Enable VXLAN
- name: CALICO_IPV4POOL_IPIP
value: "Never"
# Enable or Disable VXLAN on the default IP pool.
- name: CALICO_IPV4POOL_VXLAN - name: CALICO_IPV4POOL_VXLAN
value: "Always" 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 # Set MTU for tunnel device used if ipip is enabled
- name: FELIX_IPINIPMTU - name: FELIX_IPINIPMTU
valueFrom: valueFrom: