From afe28c6fc8341227b72aad6fcb8078cf8e89ab60 Mon Sep 17 00:00:00 2001 From: llhuii Date: Fri, 30 Apr 2021 10:06:03 +0800 Subject: [PATCH] kubelet_pods.go: clean makeEnvironmentVariables For the simplicity and clarity, I think we can safely delete the `delete(serviceEnv, envVar.Name)` and the duplicate comments at function makeEnvironmentVariables of kubelet_pods.go:774-779. 1. `delete(serviceEnv, envVar.Name)` and `if _, present := tmpEnv[k]; !present` of line 796 are the same logic that is to merge the non-present keys of serviceEnv into tmpEnv. 2. And the keys deleted from serviceEnv are guarantee to be in tmpEnv, this doesn't affect mappingFunc. 3. the delete may miss some key from container.EnvFrom --- pkg/kubelet/kubelet_pods.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index b610b47ff7f..58fdaf160aa 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -779,12 +779,6 @@ func (kl *Kubelet) makeEnvironmentVariables(pod *v1.Pod, container *v1.Container runtimeVal = string(runtimeValBytes) } } - // Accesses apiserver+Pods. - // So, the master may set service env vars, or kubelet may. In case both are doing - // it, we delete the key from the kubelet-generated ones so we don't have duplicate - // env vars. - // TODO: remove this next line once all platforms use apiserver+Pods. - delete(serviceEnv, envVar.Name) tmpEnv[envVar.Name] = runtimeVal }