github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-02-21 22:57:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136131 from carlory/automated-cherry-pick-of-#136127-upstream-release-1.35

Browse Source 
Automated cherry pick of #136127: kubeadm: fix a bug where kubeadm upgrade is failed if the content of the `kubeadm-flags.env` file is `KUBELET_KUBEADM_ARGS=""`
This commit is contained in:
Kubernetes Prow Robot
2026-01-14 10:03:35 +05:30
committed by GitHub
parent 464f1dfb2d 41e2e598dc
commit dbf3460eb0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/phases/kubelet/flags.go
View File

@@ -154,7 +154,7 @@ func ReadKubeletDynamicEnvFile(kubeletEnvFilePath string) ([]string, error) {
// Split the flags string by whitespace to get individual arguments.
trimmedFlags := strings.Fields(flags)
if len(trimmedFlags) == 0 {
return nil, errors.Errorf("no flags found in file %q", kubeletEnvFilePath)
return nil, nil
}
var updatedFlags []string

8
cmd/kubeadm/app/phases/kubelet/flags_test.go
View File

@@ -193,10 +193,10 @@ func TestReadKubeadmFlags(t *testing.T) {
expectError: false,
},
{
name: "no container-runtime-endpoint found",
name: "has KUBELET_KUBEADM_ARGS line but no args",
fileContent: `KUBELET_KUBEADM_ARGS=""`,
expectedValue: nil,
expectError: true,
expectError: false,
},
{
name: "no KUBELET_KUBEADM_ARGS line",
@@ -248,8 +248,8 @@ func TestReadKubeadmFlags(t *testing.T) {
}
value, err := ReadKubeletDynamicEnvFile(tmpFile.Name())
if !tt.expectError && err != nil {
t.Errorf("Unexpected error: %v", err)
if tt.expectError != (err != nil) {
t.Errorf("Expect error: %v, got: %v, error: %v", tt.expectError, err != nil, err)
}
assert.Equal(t, tt.expectedValue, value)