Merge pull request #415 from kinvolk/surajssd/update-calico-3.14.0

Update calico to v3.14.1
kinvolk · May 29, 2020 · 017f6e9 · 017f6e9
2 parents 85b82fa + e0a766d
commit 017f6e9
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 10 deletions.
diff --git a/...otive-kubernetes/bootkube/resources/charts/calico/crds/kubecontrollersconfigurations.yaml b/...otive-kubernetes/bootkube/resources/charts/calico/crds/kubecontrollersconfigurations.yaml
@@ -0,0 +1,12 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: kubecontrollersconfigurations.crd.projectcalico.org
+spec:
+  scope: Cluster
+  group: crd.projectcalico.org
+  version: v1
+  names:
+    kind: KubeControllersConfiguration
+    plural: kubecontrollersconfigurations
+    singular: kubecontrollersconfiguration
diff --git a/assets/lokomotive-kubernetes/bootkube/resources/charts/calico/templates/deployment.yaml b/assets/lokomotive-kubernetes/bootkube/resources/charts/calico/templates/deployment.yaml
@@ -42,6 +42,10 @@ spec:
               value: node
             - name: DATASTORE_TYPE
               value: kubernetes
+            # This is disabled until the HostEndpoints created by this controller are better
+            # parameterised. See https://github.com/projectcalico/calico/issues/3566.
+            # - name: AUTO_HOST_ENDPOINTS
+            #   value: "enabled"
           readinessProbe:
             exec:
               command:
@@ -93,6 +97,16 @@ rules:
       - create
       - update
       - delete
+  # kube-controllers manages hostendpoints.
+  - apiGroups: ["crd.projectcalico.org"]
+    resources:
+      - hostendpoints
+    verbs:
+      - get
+      - list
+      - create
+      - update
+      - delete
   # Needs access to update clusterinformations.
   - apiGroups: ["crd.projectcalico.org"]
     resources:
@@ -109,6 +123,19 @@ rules:
       - use
     resourceNames:
       - calico-kube-controllers
+  # KubeControllersConfiguration is where it gets its config
+  - apiGroups: ["crd.projectcalico.org"]
+    resources:
+      - kubecontrollersconfigurations
+    verbs:
+      # read its own config
+      - get
+      # create a default if none exists
+      - create
+      # update status
+      - update
+      # watch for changes
+      - watch
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/assets/lokomotive-kubernetes/bootkube/resources/charts/calico/values.yaml b/assets/lokomotive-kubernetes/bootkube/resources/charts/calico/values.yaml
@@ -1,8 +1,8 @@
 calico:
   networkMTU: 1500
-  image: calico/node:v3.13.3
-  cniImage: calico/cni:v3.13.3
-  controllersImage: calico/kube-controllers:v3.13.3
+  image: calico/node:v3.14.1
+  cniImage: calico/cni:v3.14.1
+  controllersImage: calico/kube-controllers:v3.14.1
   enableReporting: false
   networkIpAutodetectionMethod: first-found
   ipipEnabled: true

diff --git a/assets/lokomotive-kubernetes/bootkube/variables.tf b/assets/lokomotive-kubernetes/bootkube/variables.tf
@@ -89,9 +89,9 @@ variable "container_images" {
   type        = map(string)
 
   default = {
-    calico                  = "calico/node:v3.13.3"
-    calico_cni              = "calico/cni:v3.13.3"
-    calico_controllers      = "calico/kube-controllers:v3.13.3"
+    calico                  = "calico/node:v3.14.1"
+    calico_cni              = "calico/cni:v3.14.1"
+    calico_controllers      = "calico/kube-controllers:v3.14.1"
     hyperkube               = "k8s.gcr.io/hyperkube:v1.18.3"
     coredns                 = "coredns/coredns:coredns-"
     pod_checkpointer        = "kinvolk/pod-checkpointer:83e25e5968391b9eb342042c435d1b3eeddb2be1"