From 176451f4ead0e0612ae71522e91c2f78ff1be993 Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Wed, 25 Aug 2021 00:27:17 +0900
Subject: [PATCH] Fix rootless regression in 1.22 (Set KubeletInUserNamespace
 gate) (#3901)

Fix issue 3900

Kubernetes 1.22 requires `KuebletInUserNamespace` feature gate to be set for rootless:
https://kubernetes.io/docs/tasks/administer-cluster/kubelet-in-userns/#userns-the-hard-way

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 pkg/daemons/agent/agent_linux.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/daemons/agent/agent_linux.go b/pkg/daemons/agent/agent_linux.go
index c8a202f070..377b9b80ce 100644
--- a/pkg/daemons/agent/agent_linux.go
+++ b/pkg/daemons/agent/agent_linux.go
@@ -18,6 +18,7 @@ import (
 )
 
 func createRootlessConfig(argsMap map[string]string, hasCFS, hasPIDs bool) {
+	argsMap["feature-gates=KubeletInUserNamespace"] = "true"
 	// "/sys/fs/cgroup" is namespaced
 	cgroupfsWritable := unix.Access("/sys/fs/cgroup", unix.W_OK) == nil
 	if hasCFS && hasPIDs && cgroupfsWritable {