diff options
| author |  Miek Gieben <miek@miek.nl>
| 2017-11-13 16:08:43 +0000 |
|---|---|---|
| committer | Miek Gieben <miek@miek.nl>
| 2017-11-13 16:08:43 +0000 |
| commit | d0c7a87b69c98b084fbcec1b7a5bc2aee208232e (patch) | |
| tree | b9f4aba9f3a6b2269e8943cf8f13295d69569c02 | |
| parent | 42504332ae9a3cef2b01d7ead082ba3b36582992 (diff) | |
| parent | f4f1736329b3bbbe13c8fa7aa2c9fdfab5cd1cbd (diff) | |
| download | coredns-d0c7a87b69c98b084fbcec1b7a5bc2aee208232e.tar.gz coredns-d0c7a87b69c98b084fbcec1b7a5bc2aee208232e.tar.zst coredns-d0c7a87b69c98b084fbcec1b7a5bc2aee208232e.zip | |
Merge branch 'master' of github.com:coredns/coredns
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | plugin/kubernetes/kubernetes.go | 3 |
2 files changed, 4 insertions, 1 deletions
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 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 |