Skip to content

Commit

Permalink
Merge pull request #68 from galexrt/update_calico_canal
Browse files Browse the repository at this point in the history
  • Loading branch information
galexrt authored May 24, 2020
2 parents 3b5f1f9 + 916ea29 commit 83da22f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions vagrantfiles/Vagrantfile_scripts
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ case "#{$kube_network}" in
if [ -n "#{HTTP_PROXY}" ]; then
export HTTP_PROXY="#{HTTP_PROXY}" HTTPS_PROXY="#{HTTPS_PROXY}" NO_PROXY="#{NO_PROXY}"
fi
curl --retry 5 --fail -s https://docs.projectcalico.org/v3.13/getting-started/kubernetes/installation/hosted/canal/canal.yaml
curl --retry 5 --fail -s https://docs.projectcalico.org/v3.14/getting-started/kubernetes/installation/hosted/canal/canal.yaml
) | \
sed -e 's/canal_iface:.*/canal_iface: "eth1"/' | \
kubectl apply -f -
Expand All @@ -155,7 +155,7 @@ case "#{$kube_network}" in
if [ -n "#{HTTP_PROXY}" ]; then
export HTTP_PROXY="#{HTTP_PROXY}" HTTPS_PROXY="#{HTTPS_PROXY}" NO_PROXY="#{NO_PROXY}"
fi
curl --retry 5 --fail -s https://docs.projectcalico.org/v3.13/manifests/calico.yaml
curl --retry 5 --fail -s https://docs.projectcalico.org/v3.14/manifests/calico.yaml
) | \
sed -e 's?192.168.0.0/16?#{POD_NW_CIDR}?g' | \
kubectl apply -f -
Expand Down

0 comments on commit 83da22f

Please sign in to comment.