diff --git a/pkg/kubectl/kubectl.go b/pkg/kubectl/kubectl.go index 13ff22ef094..0066f3e845d 100644 --- a/pkg/kubectl/kubectl.go +++ b/pkg/kubectl/kubectl.go @@ -46,10 +46,10 @@ func GetKubeClient(config *client.Config, matchVersion bool) (*client.Client, er clientVersion := version.Get() serverVersion, err := c.ServerVersion() if err != nil { - return nil, fmt.Errorf("Couldn't read version from server: %v\n", err) + return nil, fmt.Errorf("couldn't read version from server: %v\n", err) } if s := *serverVersion; !reflect.DeepEqual(clientVersion, s) { - return nil, fmt.Errorf("Server version (%#v) differs from client version (%#v)!\n", s, clientVersion) + return nil, fmt.Errorf("server version (%#v) differs from client version (%#v)!\n", s, clientVersion) } } @@ -92,7 +92,7 @@ func LoadNamespaceInfo(path string) (*NamespaceInfo, error) { // SaveNamespaceInfo saves a NamespaceInfo object at the specified file path. func SaveNamespaceInfo(path string, ns *NamespaceInfo) error { if !util.IsDNSLabel(ns.Namespace) { - return fmt.Errorf("Namespace %s is not a valid DNS Label", ns.Namespace) + return fmt.Errorf("namespace %s is not a valid DNS Label", ns.Namespace) } data, err := json.Marshal(ns) err = ioutil.WriteFile(path, data, 0600) diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index 48b573f00f8..ab95e5adb72 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -51,7 +51,7 @@ func GetPrinter(format, templateFile string, defaultPrinter ResourcePrinter) (Re } tmpl, err := template.New("output").Parse(templateFile) if err != nil { - return nil, false, fmt.Errorf("Error parsing template %s, %v\n", string(data), err) + return nil, false, fmt.Errorf("error parsing template %s, %v\n", string(data), err) } printer = &TemplatePrinter{ Template: tmpl, @@ -62,14 +62,14 @@ func GetPrinter(format, templateFile string, defaultPrinter ResourcePrinter) (Re var err error data, err = ioutil.ReadFile(templateFile) if err != nil { - return nil, false, fmt.Errorf("Error reading template %s, %v\n", templateFile, err) + return nil, false, fmt.Errorf("error reading template %s, %v\n", templateFile, err) } } else { return nil, false, fmt.Errorf("templatefile format specified but no template file given") } tmpl, err := template.New("output").Parse(string(data)) if err != nil { - return nil, false, fmt.Errorf("Error parsing template %s, %v\n", string(data), err) + return nil, false, fmt.Errorf("error parsing template %s, %v\n", string(data), err) } printer = &TemplatePrinter{ Template: tmpl, @@ -157,16 +157,16 @@ func (h *HumanReadablePrinter) Handler(columns []string, printFunc interface{}) func (h *HumanReadablePrinter) validatePrintHandlerFunc(printFunc reflect.Value) error { if printFunc.Kind() != reflect.Func { - return fmt.Errorf("Invalid print handler. %#v is not a function.", printFunc) + return fmt.Errorf("invalid print handler. %#v is not a function.", printFunc) } funcType := printFunc.Type() if funcType.NumIn() != 2 || funcType.NumOut() != 1 { - return fmt.Errorf("Invalid print handler." + + return fmt.Errorf("invalid print handler." + "Must accept 2 parameters and return 1 value.") } if funcType.In(1) != reflect.TypeOf((*io.Writer)(nil)).Elem() || funcType.Out(0) != reflect.TypeOf((*error)(nil)).Elem() { - return fmt.Errorf("Invalid print handler. The expected signature is: "+ + return fmt.Errorf("invalid print handler. The expected signature is: "+ "func handler(obj %v, w io.Writer) error", funcType.In(0)) } return nil @@ -317,7 +317,7 @@ func (h *HumanReadablePrinter) PrintObj(obj runtime.Object, output io.Writer) er return resultValue.Interface().(error) } } else { - return fmt.Errorf("Error: unknown type %#v", obj) + return fmt.Errorf("error: unknown type %#v", obj) } }