From b8aa6d752aa85d75f6397eb7c575bb6ad36a5576 Mon Sep 17 00:00:00 2001 From: Rodrigo Campos Date: Mon, 4 Mar 2024 16:05:02 -0300 Subject: [PATCH] kubelet: Add logs for userns custom mappings parsing Signed-off-by: Rodrigo Campos --- pkg/kubelet/kubelet_pods.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index b93c8a3bd18..5925751f93c 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -137,6 +137,7 @@ func (kl *Kubelet) getKubeletMappings() (uint32, uint32, error) { var unknownUserErr user.UnknownUserError if goerrors.As(err, &unknownUserErr) { // if the user is not found, we assume that the user is not configured + klog.V(5).InfoS("user namespaces: user not found, using default mappings", "user", kubeletUser) return defaultFirstID, defaultLen, nil } return 0, 0, err @@ -146,14 +147,14 @@ func (kl *Kubelet) getKubeletMappings() (uint32, uint32, error) { cmd, err := exec.LookPath(execName) if err != nil { if os.IsNotExist(err) { - klog.V(2).InfoS("Could not find executable, default mappings will be used for the user namespaces", "executable", execName, "err", err) + klog.V(2).InfoS("user namespaces: executable not found, using default mappings", "executable", execName, "err", err) return defaultFirstID, defaultLen, nil } return 0, 0, err } outUids, err := exec.Command(cmd, kubeletUser).Output() if err != nil { - return 0, 0, fmt.Errorf("error retrieving additional ids for user %q", kubeletUser) + return 0, 0, fmt.Errorf("error retrieving additional uids for user %q: %w", kubeletUser, err) } outGids, err := exec.Command(cmd, "-g", kubeletUser).Output() if err != nil { @@ -162,6 +163,7 @@ func (kl *Kubelet) getKubeletMappings() (uint32, uint32, error) { if string(outUids) != string(outGids) { return 0, 0, fmt.Errorf("mismatched subuids and subgids for user %q", kubeletUser) } + klog.V(5).InfoS("user namespaces: user found, using mappings from getsubids", "user", kubeletUser) return parseGetSubIdsOutput(string(outUids)) }