Merge pull request kubernetes#129483 from pacoxu/fix-no-sandbox

k8s-ci-robot · web-flow · commit 2e5379960150 · 2025-01-07T05:06:36.000+01:00
kubeadm: should not warn on non-detect sandbox image
diff --git a/cmd/kubeadm/app/util/runtime/runtime.go b/cmd/kubeadm/app/util/runtime/runtime.go
@@ -293,5 +293,9 @@ func (runtime *CRIRuntime) SandboxImage() (string, error) {
 		return "", errors.Wrap(err, "failed to unmarshal CRI info config")
 	}
 
+	if c.SandboxImage == "" {
+		return "", errors.New("no 'sandboxImage' field in CRI info config")
+	}
+
 	return c.SandboxImage, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -293,5 +293,9 @@ func (runtime *CRIRuntime) SandboxImage() (string, error) {`
`293`	`293`	`return "", errors.Wrap(err, "failed to unmarshal CRI info config")`
`294`	`294`	`}`
`295`	`295`
	`296`	`+ if c.SandboxImage == "" {`
	`297`	`+ return "", errors.New("no 'sandboxImage' field in CRI info config")`
	`298`	`+ }`
	`299`	`+`
`296`	`300`	`return c.SandboxImage, nil`
`297`	`301`	`}`