Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 00:34:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Miek Gieben
2017-11-13 16:08:43 +00:00
parent 42504332ae f4f1736329
commit d0c7a87b69
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@@ -21,7 +21,7 @@ Please be kind. :smile: Remember that CoreDNS comes at no cost to you, and you'r
getting free help. getting free help.
We are using [Stable Bot](https://github.com/probot/stale) to close inactive issues. If you feel an 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. then.
## Minor improvements and new tests ## Minor improvements and new tests

3
plugin/kubernetes/kubernetes.go
View File

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