From 9edfd11386d92f806e37b723e15499da104e9279 Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Mon, 13 Nov 2017 11:26:44 +0000 Subject: [PATCH 1/2] Fix saying (#1225) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e0b77a58f..c44b85f9d 100644 --- a/CONTRIBUTING.md +++ b/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 From f4f1736329b3bbbe13c8fa7aa2c9fdfab5cd1cbd Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Mon, 13 Nov 2017 11:01:57 -0500 Subject: [PATCH 2/2] plugin/kubernetes: check err in getClientConfig (#1230) Check the error returned by clientConfig.ClientConfig() before trying to set cc.ContentType. Signed-off-by: Andy Goldstein --- plugin/kubernetes/kubernetes.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin/kubernetes/kubernetes.go b/plugin/kubernetes/kubernetes.go index 044541afb..625422935 100644 --- a/plugin/kubernetes/kubernetes.go +++ b/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