Simplify getting configuration.

This commit is contained in:
Oleksii Kliukin 2017-03-07 14:39:41 +01:00 committed by Murat Kabilov
parent 021eedb226
commit 776ed3fa0f
1 changed files with 3 additions and 11 deletions

View File

@ -14,19 +14,11 @@ import (
"github.bus.zalan.do/acid/postgres-operator/pkg/util/constants"
)
func RestConfig(kubeConfig string, outOfCluster bool) (config *rest.Config, err error) {
func RestConfig(kubeConfig string, outOfCluster bool) (*rest.Config, error) {
if outOfCluster {
/* out-of-cluster process */
rules := clientcmd.NewDefaultClientConfigLoadingRules()
overrides := &clientcmd.ConfigOverrides{}
rules.ExplicitPath = kubeConfig
config, err = clientcmd.NewNonInteractiveDeferredLoadingClientConfig(rules, overrides).ClientConfig()
} else {
/* in-cluster pod */
config, err = rest.InClusterConfig()
return clientcmd.BuildConfigFromFlags("", kubeConfig)
}
return
return rest.InClusterConfig()
}
func KubernetesClient(config *rest.Config) (client *kubernetes.Clientset, err error) {