@@ -20,6 +20,7 @@ import (
2020"path/filepath"
2121
2222"github.com/prometheus/client_golang/prometheus"
23+ "github.com/sorintlab/stolon/internal/cluster"
2324"github.com/sorintlab/stolon/internal/common"
2425"github.com/sorintlab/stolon/internal/store"
2526"github.com/sorintlab/stolon/internal/util"
@@ -166,23 +167,7 @@ func NewStore(cfg *CommonConfig) (store.Store, error) {
166167}
167168s = store .NewKVBackedStore (kvstore ,storePath )
168169case "kubernetes" :
169- kubeClientConfig := util .NewKubeClientConfig (cfg .KubeConfig ,cfg .KubeContext ,cfg .KubeNamespace )
170- kubecfg ,err := kubeClientConfig .ClientConfig ()
171- if err != nil {
172- return nil ,err
173- }
174- kubecli ,err := kubernetes .NewForConfig (kubecfg )
175- if err != nil {
176- return nil ,fmt .Errorf ("cannot create kubernetes client: %v" ,err )
177- }
178- var podName string
179- if ! cfg .IsStolonCtl {
180- podName ,err = util .PodName ()
181- if err != nil {
182- return nil ,err
183- }
184- }
185- namespace ,_ ,err := kubeClientConfig .Namespace ()
170+ kubecli ,podName ,namespace ,err := getKubeValues (cfg )
186171if err != nil {
187172return nil ,err
188173}
@@ -212,23 +197,7 @@ func NewElection(cfg *CommonConfig, uid string) (store.Election, error) {
212197}
213198election = store .NewKVBackedElection (kvstore ,filepath .Join (storePath ,common .SentinelLeaderKey ),uid )
214199case "kubernetes" :
215- kubeClientConfig := util .NewKubeClientConfig (cfg .KubeConfig ,cfg .KubeContext ,cfg .KubeNamespace )
216- kubecfg ,err := kubeClientConfig .ClientConfig ()
217- if err != nil {
218- return nil ,err
219- }
220- kubecli ,err := kubernetes .NewForConfig (kubecfg )
221- if err != nil {
222- return nil ,fmt .Errorf ("cannot create kubernetes client: %v" ,err )
223- }
224- var podName string
225- if ! cfg .IsStolonCtl {
226- podName ,err = util .PodName ()
227- if err != nil {
228- return nil ,err
229- }
230- }
231- namespace ,_ ,err := kubeClientConfig .Namespace ()
200+ kubecli ,podName ,namespace ,err := getKubeValues (cfg )
232201if err != nil {
233202return nil ,err
234203}
@@ -240,3 +209,28 @@ func NewElection(cfg *CommonConfig, uid string) (store.Election, error) {
240209
241210return election ,nil
242211}
212+
213+ func getKubeValues (cfg * CommonConfig ) (* kubernetes.Clientset ,string ,string ,error ) {
214+ kubeClientConfig := util .NewKubeClientConfig (cfg .KubeConfig ,cfg .KubeContext ,cfg .KubeNamespace )
215+ kubecfg ,err := kubeClientConfig .ClientConfig ()
216+ if err != nil {
217+ return nil ,"" ,"" ,err
218+ }
219+ kubecfg .Timeout = cluster .DefaultStoreTimeout
220+ kubecli ,err := kubernetes .NewForConfig (kubecfg )
221+ if err != nil {
222+ return nil ,"" ,"" ,fmt .Errorf ("cannot create kubernetes client: %v" ,err )
223+ }
224+ var podName string
225+ if ! cfg .IsStolonCtl {
226+ podName ,err = util .PodName ()
227+ if err != nil {
228+ return nil ,"" ,"" ,err
229+ }
230+ }
231+ namespace ,_ ,err := kubeClientConfig .Namespace ()
232+ if err != nil {
233+ return nil ,"" ,"" ,err
234+ }
235+ return kubecli ,podName ,namespace ,nil
236+ }