TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

mw/kubernetes: revert if-else for health (#970)

Browse source 
Do the return early and dedent the rest of the function.
This commit is contained in:
Miek Gieben 2017-08-23 16:30:19 +01:00 • committed by Yong Tang
parent 4b105c761e
commit 10b7221067
1 changed files with 58 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

18
middleware/kubernetes/kubernetes.go
View file

@ -154,7 +154,15 @@ func (k *Kubernetes) getClientConfig() (*rest.Config, error) {
overrides := &clientcmd.ConfigOverrides{} overrides := &clientcmd.ConfigOverrides{}
clusterinfo := clientcmdapi.Cluster{} clusterinfo := clientcmdapi.Cluster{}
authinfo := clientcmdapi.AuthInfo{} authinfo := clientcmdapi.AuthInfo{}
if len(k.APIServerList) > 0 {
if len(k.APIServerList) == 0 {
cc, err := rest.InClusterConfig()
if err != nil {
return nil, err
}
return cc, err
}
endpoint := k.APIServerList[0] endpoint := k.APIServerList[0]
if len(k.APIServerList) > 1 { if len(k.APIServerList) > 1 {
// Use a random port for api proxy, will get the value later through listener.Addr() // Use a random port for api proxy, will get the value later through listener.Addr()
@ -210,13 +218,7 @@ func (k *Kubernetes) getClientConfig() (*rest.Config, error) {
endpoint = fmt.Sprintf("http://%s", listener.Addr()) endpoint = fmt.Sprintf("http://%s", listener.Addr())
} }
clusterinfo.Server = endpoint clusterinfo.Server = endpoint
} else {
cc, err := rest.InClusterConfig()
if err != nil {
return nil, err
}
return cc, err
}
if len(k.APICertAuth) > 0 { if len(k.APICertAuth) > 0 {
clusterinfo.CertificateAuthority = k.APICertAuth clusterinfo.CertificateAuthority = k.APICertAuth
} }