public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/util/k8sutil/k8sutil.go
View File

@ -14,19 +14,11 @@ import (
"github.bus.zalan.do/acid/postgres-operator/pkg/util/constants" "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 { if outOfCluster {
/* out-of-cluster process */ return clientcmd.BuildConfigFromFlags("", kubeConfig)
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 rest.InClusterConfig()
return
} }
func KubernetesClient(config *rest.Config) (client *kubernetes.Clientset, err error) { func KubernetesClient(config *rest.Config) (client *kubernetes.Clientset, err error) {