Skip to content

Commit e10d30a

Browse files
committed
pkg/client/config: switch to setting RecommendedHomeFile directly
1 parent 6b15e78 commit e10d30a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pkg/client/config/config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"fmt"
2222
"os"
2323
"os/user"
24+
"path"
2425

2526
"k8s.io/client-go/rest"
2627
"k8s.io/client-go/tools/clientcmd"
@@ -129,10 +130,9 @@ func loadConfig(context string) (*rest.Config, error) {
129130
if err != nil {
130131
return nil, fmt.Errorf("could not get current user: %v", err)
131132
}
132-
if err := os.Setenv("HOME", u.HomeDir); err != nil {
133-
return nil, fmt.Errorf("could not set HOME env var: %v", err)
134-
}
135-
defer func() { _ = os.Unsetenv("HOME") }()
133+
oldRecommendedHomeFile := clientcmd.RecommendedHomeFile
134+
clientcmd.RecommendedHomeFile = path.Join(u.HomeDir, clientcmd.RecommendedHomeDir, clientcmd.RecommendedFileName)
135+
defer func() { clientcmd.RecommendedHomeFile = oldRecommendedHomeFile }()
136136
}
137137
if c, err := loadConfigWithContext(apiServerURL, clientcmd.NewDefaultClientConfigLoadingRules(), context); err == nil {
138138
return c, nil

0 commit comments

Comments
 (0)