Merge branch 'master' of github.com:coredns/coredns

CONTRIBUTING.md

@@ -21,7 +21,7 @@ Please be kind. :smile: Remember that CoreDNS comes at no cost to you, and you'r
 getting free help.
 
 We are using [Stable Bot](https://github.com/probot/stale) to close inactive issues. If you feel an
-issue should not be closed you can add the "pinned" label to it or just update the bug ever now or
+issue should not be closed you can add the "pinned" label to it or just update the bug every now and
 then.
 
 ## Minor improvements and new tests

plugin/kubernetes/kubernetes.go

@@ -222,6 +222,9 @@ func (k *Kubernetes) getClientConfig() (*rest.Config, error) {
 	clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, overrides)
 
 	cc, err := clientConfig.ClientConfig()
+	if err != nil {
+		return nil, err
+	}
 	cc.ContentType = "application/vnd.kubernetes.protobuf"
 	return cc, err