Update calico to v3.16.5 including eBPF mode pre-requirements

Signed-off-by: Maximilian Lampert <ml@mlampert.de>
kubermatic · Nov 16, 2020 · bf0b680 · bf0b680
1 parent 3e84d52
commit bf0b680
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 5 deletions.
diff --git a/pkg/templates/canal/canal.go b/pkg/templates/canal/canal.go
@@ -35,9 +35,9 @@ import (
 
 const (
 	calicoImageRegistry = "docker.io"
-	installCNIImageName = "/calico/cni:v3.15.1"
-	calicoImageName     = "/calico/node:v3.15.1"
-	controllerImageName = "/calico/kube-controllers:v3.15.1"
+	installCNIImageName = "/calico/cni:v3.16.5"
+	calicoImageName     = "/calico/node:v3.16.5"
+	controllerImageName = "/calico/kube-controllers:v3.16.5"
 	flannelImageRegisty = "quay.io"
 	flannelImageName    = "/coreos/flannel:v0.13.0"
 	canalComponentLabel = "canal"
@@ -51,7 +51,8 @@ const (
   "plugins": [
     {
       "type": "calico",
-      "log_level": "info",
+	  "log_level": "info",
+	  "log_file_path": "/var/log/calico/cni/cni.log",
       "datastore_type": "kubernetes",
       "nodename": "__KUBERNETES_NODE_NAME__",
       "mtu": __CNI_MTU__,

diff --git a/pkg/templates/canal/daemonset.go b/pkg/templates/canal/daemonset.go
@@ -30,8 +30,11 @@ func daemonSet(ifacePatch bool, clusterCIDR, installCNIImage, calicoImage, flann
 	maxUnavailable := intstr.FromInt(1)
 	terminationGracePeriodSeconds := int64(0)
 	privileged := true
+	optional := true
 	fileOrCreate := corev1.HostPathFileOrCreate
 	directoryOrCreate := corev1.HostPathDirectoryOrCreate
+	bidirectionalMountPropagation := corev1.MountPropagationBidirectional
+
 	commonLabels := map[string]string{
 		"k8s-app": "canal",
 	}
@@ -137,7 +140,18 @@ func daemonSet(ifacePatch bool, clusterCIDR, installCNIImage, calicoImage, flann
 							Name:  "install-cni",
 							Image: installCNIImage,
 							Command: []string{
-								"/install-cni.sh",
+								"/opt/cni/bin/install",
+							},
+							EnvFrom: []corev1.EnvFromSource{
+								{
+									// Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
+									ConfigMapRef: &corev1.ConfigMapEnvSource{
+										LocalObjectReference: corev1.LocalObjectReference{
+											Name: "kubernetes-services-endpoint",
+										},
+										Optional: &optional,
+									},
+								},
 							},
 							Env: []corev1.EnvVar{
 								{
@@ -197,6 +211,17 @@ func daemonSet(ifacePatch bool, clusterCIDR, installCNIImage, calicoImage, flann
 						{
 							Name:  "calico-node",
 							Image: calicoImage,
+							EnvFrom: []corev1.EnvFromSource{
+								{
+									// Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
+									ConfigMapRef: &corev1.ConfigMapEnvSource{
+										LocalObjectReference: corev1.LocalObjectReference{
+											Name: "kubernetes-services-endpoint",
+										},
+										Optional: &optional,
+									},
+								},
+							},
 							Env: []corev1.EnvVar{
 								{
 									// Use Kubernetes API as the backing datastore
@@ -330,6 +355,11 @@ func daemonSet(ifacePatch bool, clusterCIDR, installCNIImage, calicoImage, flann
 									MountPath: "/var/run/nodeagent",
 									Name:      "policysync",
 								},
+								{
+									MountPath:        "/sys/fs/",
+									Name:             "sysfs",
+									MountPropagation: &bidirectionalMountPropagation,
+								},
 							},
 						},
 						{
@@ -394,6 +424,15 @@ func daemonSet(ifacePatch bool, clusterCIDR, installCNIImage, calicoImage, flann
 								},
 							},
 						},
+						{
+							Name: "sysfs",
+							VolumeSource: corev1.VolumeSource{
+								HostPath: &corev1.HostPathVolumeSource{
+									Path: "/sys/fs/",
+									Type: &directoryOrCreate,
+								},
+							},
+						},
 						{
 							Name: "flannel-cfg",
 							VolumeSource: corev1.VolumeSource{