From 1a63e6fead3a15d03b4760b9322fa4013c8529e2 Mon Sep 17 00:00:00 2001 From: mattjmcnaughton Date: Sun, 10 May 2020 10:22:56 -0400 Subject: [PATCH] Clarify `kubelet_dockershim_nodocker` error message Clarify the error message returned when trying to use the docker runtime on a Kubelet that was compiled without Docker. We removed the "w/" and "w/o", which can be confusing abbreviations, and also add slightly more detail on the actual error. --- pkg/kubelet/kubelet_dockershim_nodocker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/kubelet_dockershim_nodocker.go b/pkg/kubelet/kubelet_dockershim_nodocker.go index 63cb51fd98b..7ee122f0c4f 100644 --- 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") }