Use ip-masq-agent for MASQUERADE when using Calico policy

cluster/addons/calico-policy-controller/README.md

@@ -3,13 +3,6 @@
 
 Calico is an implementation of the Kubernetes network policy API.  The provided manifest installs a DaemonSet which runs Calico on each node in the cluster.
 
-### Templating
-
-The provided `calico-node.yaml` manifest includes the following placeholders which are populated
-via templating.
-
-- `__CLUSTER_CIDR__`: The IP range from which Pod IP addresses are assigned.
-
 ### Learn More
 
 Learn more about Calico at http://docs.projectcalico.org

cluster/addons/calico-policy-controller/calico-node.yaml

@@ -32,10 +32,6 @@ spec:
               value: "true"
             - name: CALICO_NETWORKING_BACKEND
               value: "none"
-            - name: CALICO_IPV4POOL_CIDR
-              value: "__CLUSTER_CIDR__"
-            - name: CALICO_IPV4POOL_IPIP
-              value: "off"
             - name: DATASTORE_TYPE
               value: "kubernetes"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
@@ -48,6 +44,8 @@ spec:
               value: "true"
             - name: IP
               value: ""
+            - name: NO_DEFAULT_POOLS
+              value: "true"
             - name: NODENAME
               valueFrom:
                 fieldRef: