Merge pull request #503 from simonswine/update-calico-3.1.3

Upgrade calico to 3.1.3

Author: jetstack-bot

CHANGELOG.md

@@ -21,7 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 | Consul      |                    | `1.0.6`  |
 | Vault       |                    | `0.9.5`  |
 | Kubernetes  | `>= 1.7 && < 1.11` | `1.10.6` |
-| Calico      |                    | `3.1.1`  |
+| Calico      |                    | `3.1.3`  |
 | Vault Helper|                    | `0.9.13` |
 | Etcd        |                    | `3.2.24` |
 

puppet/modules/calico/manifests/node.pp

@@ -5,9 +5,9 @@
 # @param metrics_port Port for felix metrics endpoint, 0 disables metrics collection
 class calico::node (
   String $node_image = 'quay.io/calico/node',
-  String $node_version = '3.1.1',
+  String $node_version = '3.1.3',
   String $cni_image = 'quay.io/calico/cni',
-  String $cni_version = '3.1.1',
+  String $cni_version = '3.1.3',
   Enum['always', 'cross-subnet', 'off'] $ipv4_pool_ipip_mode = 'always',
   Integer[0,65535] $metrics_port = 9091,
 )

puppet/modules/calico/manifests/policy_controller.pp

@@ -1,6 +1,6 @@
 class calico::policy_controller (
   String $image = 'quay.io/calico/kube-controllers',
-  String $version = '3.1.1',
+  String $version = '3.1.3',
 )
 {
   include ::kubernetes

puppet/modules/calico/templates/node-daemonset.yaml.erb

@@ -41,12 +41,14 @@ spec:
       terminationGracePeriodSeconds: 0
 <%- unless @version_before_1_6 -%>
       tolerations:
-      - key: "CriticalAddonsOnly"
-        operator: "Exists"
-      - key: "dedicated"
-        operator: "Exists"
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
+      # Make sure calico-node gets scheduled on all nodes.
+      - effect: NoSchedule
+        operator: Exists
+      # Mark the pod as a critical add-on for rescheduling.
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoExecute
+        operator: Exists
 <%- end -%>
       hostNetwork: true
       containers: