Update calico to use the correct CIDR for pods

Currently, we are using .NonMasqueradeCIDR in the wrong fashion. We
should be using .KubeControllerManager.ClusterCIDR to prevent IP
collision with Service IPs.

upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template

@@ -146,7 +146,7 @@ spec:
                   key: enable_bgp
             # Configure the IP Pool from which Pod IPs will be chosen.
             - name: CALICO_IPV4POOL_CIDR
-              value: "{{ .NonMasqueradeCIDR }}"
+              value: "{{ .KubeControllerManager.ClusterCIDR }}"
             - name: CALICO_IPV4POOL_IPIP
               value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}cross-subnet{{- else -}}always{{- end -}}"
             # Disable file logging so `kubectl logs` works.

upup/models/cloudup/resources/addons/networking.projectcalico.org/pre-k8s-1.6.yaml.template

@@ -92,7 +92,7 @@ spec:
               value: "true"
             # Configure the IP Pool from which Pod IPs will be chosen.
             - name: CALICO_IPV4POOL_CIDR
-              value: "{{ .NonMasqueradeCIDR }}"
+              value: "{{ .KubeControllerManager.ClusterCIDR }}"
             - name: CALICO_IPV4POOL_IPIP
               value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}cross-subnet{{- else -}}always{{- end -}}"
             # Auto-detect the BGP IP address.

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

@@ -353,7 +353,8 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	if b.cluster.Spec.Networking.Calico != nil {
 		key := "networking.projectcalico.org"
-		version := "2.1.1"
+		// 2.1.2-kops.1 = 2.1.1 with CIDR change
+		version := "2.1.2-kops.1"
 
 		{
 			location := key + "/pre-k8s-1.6.yaml"