From dd5af0bbe10e92340561987cfb8f8223c88695c5 Mon Sep 17 00:00:00 2001
From: Aditi Ghag <aditi@cilium.io>
Date: Thu, 27 May 2021 23:54:01 -0700
Subject: [PATCH] install: Mount cgroup2 filesystem from init container on host

We need to mount cgroup2 filesystem on the underlying host
in order to enable socket-based load-balancing in environments
with container runtime cgroupv2 configurations.

See issues for more details - https://github.com/cilium/cilium/pull/16259
and https://github.com/cilium/cilium/pull/16815.
---
 install/install.go          | 53 +++++++++++++++++++++++++++++++++++++
 internal/cli/cmd/install.go |  2 ++
 2 files changed, 55 insertions(+)

diff --git a/install/install.go b/install/install.go
index 0d1f3829fa..586fa98af4 100644
--- a/install/install.go
+++ b/install/install.go
@@ -530,6 +530,16 @@ func (k *K8sInstaller) generateAgentDaemonSet() *appsv1.DaemonSet {
 								},
 							},
 						},
+						{
+							// To keep state between restarts / upgrades on cgroup2 filesystem
+							Name: "cilium-cgroup",
+							VolumeSource: corev1.VolumeSource{
+								HostPath: &corev1.HostPathVolumeSource{
+									Path: k.params.CgroupHostRoot,
+									Type: &hostPathDirectoryOrCreate,
+								},
+							},
+						},
 						{
 							// To install cilium cni plugin in the host
 							Name: "cni-path",
@@ -648,6 +658,14 @@ func (k *K8sInstaller) generateAgentDaemonSet() *appsv1.DaemonSet {
 		})
 	}
 
+	// Check for duplicate mounts.
+	if strings.HasPrefix(k.params.CgroupHostRoot, "/run/cilium/") {
+		auxVolumeMounts = append(auxVolumeMounts, corev1.VolumeMount{
+			Name:      "cilium-cgroup",
+			MountPath: "/run/cilium/cgroupv2",
+		})
+	}
+
 	switch k.flavor.Kind {
 	case k8s.KindGKE:
 		nodeInitContainers = append(nodeInitContainers, corev1.Container{
@@ -702,6 +720,39 @@ func (k *K8sInstaller) generateAgentDaemonSet() *appsv1.DaemonSet {
 			},
 		},
 	})
+	// The statically linked Go program binary is invoked to avoid any
+	// dependency on utilities like sh and mount that can be missing on certain
+	// distros installed on the underlying host. Copy the binary to the
+	// same directory where we install cilium cni plugin so that exec permissions
+	// are available. More details - https://github.com/cilium/cilium/pull/16815/.
+	version := k.getCiliumVersion()
+	if version.GTE(versioncheck.MustVersion("1.10.3")) {
+		cgrpMountCmd := fmt.Sprintf(`cp /usr/bin/cilium-mount /hostbin/cilium-mount && nsenter --cgroup=/hostproc/1/ns/cgroup --mount=/hostproc/1/ns/mnt "${%s}/cilium-mount" %s; rm /hostbin/cilium-mount`,
+			k.params.CniBinPath, k.params.CgroupHostRoot)
+		cgrpContainer := corev1.Container{
+			Name:            "cgroup-mount",
+			Image:           k.fqAgentImage(),
+			ImagePullPolicy: corev1.PullIfNotPresent,
+			Command:         []string{"sh", "-c", cgrpMountCmd},
+			VolumeMounts: []corev1.VolumeMount{
+				{
+					Name:      "host-proc",
+					MountPath: "/hostproc",
+				},
+				{
+					Name:      "cni-path",
+					MountPath: "/hostbin",
+				},
+			},
+			Resources: corev1.ResourceRequirements{
+				Requests: corev1.ResourceList{
+					corev1.ResourceCPU:    resource.MustParse("100m"),
+					corev1.ResourceMemory: resource.MustParse("100Mi"),
+				},
+			},
+		}
+		nodeInitContainers = append(nodeInitContainers, cgrpContainer)
+	}
 
 	auxVolumes = append(auxVolumes, corev1.Volume{
 		Name: "host-proc",
@@ -1047,6 +1098,8 @@ type Parameters struct {
 	ConfigOverwrites     []string
 	configOverwrites     map[string]string
 	Rollback             bool
+	CgroupHostRoot       string
+	CniBinPath           string
 
 	// CiliumReadyTimeout defines the wait timeout for Cilium to become ready
 	// after installing.
diff --git a/internal/cli/cmd/install.go b/internal/cli/cmd/install.go
index d5844898b9..dca35fdde6 100644
--- a/internal/cli/cmd/install.go
+++ b/internal/cli/cmd/install.go
@@ -71,6 +71,8 @@ cilium install --context kind-cluster1 --cluster-id 1 --cluster-name cluster1
 	cmd.Flags().DurationVar(&params.CiliumReadyTimeout, "cilium-ready-timeout", 5*time.Minute,
 		"Timeout for Cilium to become ready before restarting unmanaged pods")
 	cmd.Flags().BoolVar(&params.Rollback, "rollback", true, "Roll back installed resources on failure")
+	cmd.Flags().StringVar(&params.CgroupHostRoot, "cgroup-hostRoot", "/run/cilium/cgroupv2", "Host path to mount cgroup2 filesystem")
+	cmd.Flags().StringVar(&params.CniBinPath, "cni-bin-path", "/home/kubernetes/bin", "Path for CNI binary files")
 
 	cmd.Flags().StringVar(&params.Azure.ResourceGroupName, "azure-resource-group", "", "Azure resource group name the cluster is in (required)")
 	cmd.Flags().StringVar(&params.Azure.AKSNodeResourceGroup, "azure-node-resource-group", "", "Azure node resource group name the cluster is in. Bypasses `--azure-resource-group` if provided.")