Merge pull request kubernetes#90951 from mattjmcnaughton/mattjmcnaughton/clarify-dockershim-no-docker-error-message

k8s-ci-robot · web-flow · commit e26af96b8e97 · 2020-05-11T18:08:42.000-07:00
Clarify `kubelet_dockershim_nodocker` error message
diff --git a/pkg/kubelet/kubelet_dockershim_nodocker.go b/pkg/kubelet/kubelet_dockershim_nodocker.go
@@ -32,5 +32,5 @@ func runDockershim(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
 	remoteImageEndpoint string,
 	nonMasqueradeCIDR string) error {
 
-	return fmt.Errorf("trying to use docker runtime, w/ Kubelet compiled w/o docker support")
+	return fmt.Errorf("trying to use docker runtime when Kubelet was compiled without docker support")
 }

Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ func runDockershim(kubeCfg *kubeletconfiginternal.KubeletConfiguration,`
`32`	`32`	`remoteImageEndpoint string,`
`33`	`33`	`nonMasqueradeCIDR string) error {`
`34`	`34`
`35`		`- return fmt.Errorf("trying to use docker runtime, w/ Kubelet compiled w/o docker support")`
	`35`	`+ return fmt.Errorf("trying to use docker runtime when Kubelet was compiled without docker support")`
`36`	`36`	`}`