From 958d6fc427b45a0fb0ef8ff740504b2c91b43424 Mon Sep 17 00:00:00 2001 From: Nick Baker Date: Mon, 15 Jul 2024 16:25:00 -0700 Subject: [PATCH] bug(nodeadm): Don't wrap kubelet systemd environment variable (#1880) --- nodeadm/internal/kubelet/config.go | 2 +- nodeadm/internal/kubelet/environment.go | 7 +------ nodeadm/test/e2e/cases/kubelet-flags/run.sh | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/nodeadm/internal/kubelet/config.go b/nodeadm/internal/kubelet/config.go index 6fce79f28..978a2b24b 100644 --- a/nodeadm/internal/kubelet/config.go +++ b/nodeadm/internal/kubelet/config.go @@ -379,7 +379,7 @@ func (k *kubelet) writeKubeletConfigToDir(cfg *api.NodeConfig) error { k.flags["config-dir"] = dirPath zap.L().Info("Enabling kubelet config drop-in dir..") - k.setEnv("KUBELET_CONFIG_DROPIN_DIR_ALPHA", "on") + k.environment["KUBELET_CONFIG_DROPIN_DIR_ALPHA"] = "on" filePath := path.Join(dirPath, "00-nodeadm.conf") // merge in default type metadata like kind and apiVersion in case the diff --git a/nodeadm/internal/kubelet/environment.go b/nodeadm/internal/kubelet/environment.go index 6abf8a9cd..7c11b061f 100644 --- a/nodeadm/internal/kubelet/environment.go +++ b/nodeadm/internal/kubelet/environment.go @@ -30,12 +30,7 @@ func (k *kubelet) writeKubeletEnvironment(cfg *api.NodeConfig) error { // write additional environment variables var kubeletEnvironment []string for eKey, eValue := range k.environment { - kubeletEnvironment = append(kubeletEnvironment, fmt.Sprintf(`%s="%s"`, eKey, eValue)) + kubeletEnvironment = append(kubeletEnvironment, fmt.Sprintf(`%s=%s`, eKey, eValue)) } return util.WriteFileWithDir(kubeletEnvironmentFilePath, []byte(strings.Join(kubeletEnvironment, "\n")), kubeletConfigPerm) } - -// Add values to the environment variables map in a terse manner -func (k *kubelet) setEnv(envName string, envArg string) { - k.environment[envName] = envArg -} diff --git a/nodeadm/test/e2e/cases/kubelet-flags/run.sh b/nodeadm/test/e2e/cases/kubelet-flags/run.sh index 4235fc719..6de36c942 100755 --- a/nodeadm/test/e2e/cases/kubelet-flags/run.sh +++ b/nodeadm/test/e2e/cases/kubelet-flags/run.sh @@ -12,5 +12,5 @@ wait::dbus-ready nodeadm init --skip run --config-source file://config.yaml -assert::file-contains /etc/eks/kubelet/environment '--v=5 --node-labels=foo=bar,foo2=baz --register-with-taints=foo=bar:NoSchedule"$' +assert::file-contains /etc/eks/kubelet/environment '--v=5 --node-labels=foo=bar,foo2=baz --register-with-taints=foo=bar:NoSchedule$' assert::file-contains /etc/eks/kubelet/environment '--hostname-override=i-1234567890abcdef0'