chore: Update calico to v3.7.2 (#1293)

* chore: Update calico to v3.7.2 * Fix UT for calico default addon image.
christinalau0 · May 17, 2019 · 279a235 · 279a235
1 parent 4157b3e
commit 279a235
Show file tree

Hide file tree

Showing 4 changed files with 300 additions and 282 deletions.
diff --git a/docs/topics/features.md b/docs/topics/features.md
@@ -170,9 +170,9 @@ Per default Calico still allows all communication within the cluster. Using Kube
 - [NetworkPolicy Example Walkthrough](https://kubernetes.io/docs/getting-started-guides/network-policy/walkthrough/)
 - [Calico Kubernetes](https://github.com/Azure/aks-engine/blob/master/examples/networkpolicy)
 
-### Calico 3.3 cleanup after upgrading to 3.5
+### Calico 3.3 cleanup after upgrading to 3.5 or greater
 
-Because Calico 3.3 is using Calico CNI, while Calico 3.5 moves to Azure CNI, if the cluster is upgraded from calico 3.3 to 3.5, then some manual cluster resource cleanup will be required to successfully complete the upgrade. We've provided a sample resource spec here that can be used as an example:
+Because Calico 3.3 is using Calico CNI, while Calico 3.5 or greater moves to Azure CNI, if the cluster is upgraded from calico 3.3 to 3.5 or greater, then some manual cluster resource cleanup will be required to successfully complete the upgrade. We've provided a sample resource spec here that can be used as an example:
 
 https://github.com/Azure/aks-engine/raw/master/docs/topics/calico-3.3.1-cleanup-after-upgrade.yaml
 
@@ -187,7 +187,7 @@ And then using your modified file, do something like this:
 kubectl delete -f calico-3.3.1-cleanup-after-upgrade-modified-with-my-cluster-configuration.yaml
 ```
 
-After this, addon-manager would enforce the correct spec for Calico 3.5.
+After this, addon-manager would enforce the correct spec for Calico 3.5 or greater.
 
 <a name="feat-cilium"></a>