Skip to content

Commit ef2cf0f

Browse files
committed
remove uses of pkg/homedir
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent a4f2187 commit ef2cf0f

5 files changed

Lines changed: 4 additions & 169 deletions

File tree

driver/kubernetes/context/load.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/docker/cli/cli/command"
1010
"github.com/docker/cli/cli/context"
1111
"github.com/docker/cli/cli/context/store"
12-
"github.com/docker/docker/pkg/homedir"
1312
"k8s.io/client-go/tools/clientcmd"
1413
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
1514
)
@@ -99,7 +98,8 @@ func (c *Endpoint) KubernetesConfig() clientcmd.ClientConfig {
9998
func (c *EndpointMeta) ResolveDefault() (any, *store.EndpointTLSData, error) {
10099
kubeconfig := os.Getenv("KUBECONFIG")
101100
if kubeconfig == "" {
102-
kubeconfig = filepath.Join(homedir.Get(), ".kube/config")
101+
home, _ := os.UserHomeDir()
102+
kubeconfig = filepath.Join(home, ".kube/config")
103103
}
104104
kubeEP, err := FromKubeConfig(kubeconfig, "", "")
105105
if err != nil {
@@ -156,7 +156,8 @@ func NewKubernetesConfig(configPath string) clientcmd.ClientConfig {
156156
if config := os.Getenv("KUBECONFIG"); config != "" {
157157
kubeConfig = config
158158
} else {
159-
kubeConfig = filepath.Join(homedir.Get(), ".kube/config")
159+
home, _ := os.UserHomeDir()
160+
kubeConfig = filepath.Join(home, ".kube/config")
160161
}
161162
}
162163
return clientcmd.NewNonInteractiveDeferredLoadingClientConfig(

vendor/github.com/docker/docker/pkg/homedir/homedir.go

Lines changed: 0 additions & 28 deletions
This file was deleted.

vendor/github.com/docker/docker/pkg/homedir/homedir_linux.go

Lines changed: 0 additions & 105 deletions
This file was deleted.

vendor/github.com/docker/docker/pkg/homedir/homedir_others.go

Lines changed: 0 additions & 32 deletions
This file was deleted.

vendor/modules.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ github.com/docker/docker/internal/lazyregexp
281281
github.com/docker/docker/internal/multierror
282282
github.com/docker/docker/pkg/archive
283283
github.com/docker/docker/pkg/atomicwriter
284-
github.com/docker/docker/pkg/homedir
285284
github.com/docker/docker/pkg/idtools
286285
github.com/docker/docker/pkg/jsonmessage
287286
github.com/docker/docker/pkg/namesgenerator

0 commit comments

Comments
 (0)