kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2205 from ulyssessouza/issue_2129 

#2129 Set proper profile when getting client info
pull/2215/head
Matt Rickard 2017-11-23 09:37:53 -08:00 committed by GitHub
parent aa7ddbc947 2b02aa30a7
commit 236d742460
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/minikube/service/service.go
View File

@ -35,9 +35,11 @@ import (
"text/template" "text/template"
"github.com/spf13/viper"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/cluster"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/util" "k8s.io/minikube/pkg/util"
) )
@ -64,18 +66,19 @@ func (k *K8sClientGetter) GetCoreClient() (corev1.CoreV1Interface, error) {
func (*K8sClientGetter) GetClientset() (*kubernetes.Clientset, error) { func (*K8sClientGetter) GetClientset() (*kubernetes.Clientset, error) {
loadingRules := clientcmd.NewDefaultClientConfigLoadingRules() loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
profile := viper.GetString(config.MachineProfile)
configOverrides := &clientcmd.ConfigOverrides{ configOverrides := &clientcmd.ConfigOverrides{
Context: clientcmdapi.Context{ Context: clientcmdapi.Context{
Cluster: "minikube", Cluster: profile,
AuthInfo: "minikube", AuthInfo: profile,
}, },
} }
kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides) kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides)
config, err := kubeConfig.ClientConfig() clientConfig, err := kubeConfig.ClientConfig()
if err != nil { if err != nil {
return nil, fmt.Errorf("Error creating kubeConfig: %s", err) return nil, fmt.Errorf("Error creating kubeConfig: %s", err)
} }
client, err := kubernetes.NewForConfig(config) client, err := kubernetes.NewForConfig(clientConfig)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Error creating new client from kubeConfig.ClientConfig()") return nil, errors.Wrap(err, "Error creating new client from kubeConfig.ClientConfig()")
} }