github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Only handle if defaultCacheDir is changed

Browse Source
This commit is contained in:
Arda Güçlü 2022-04-29 13:43:42 +03:00
parent 3d8cfaacbe
commit 937c7677a2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go
View File

@ -284,7 +284,7 @@ func (f *ConfigFlags) toDiscoveryClient() (discovery.CachedDiscoveryInterface, e
// override httpCacheDir and discoveryCacheDir if user-value is given. // override httpCacheDir and discoveryCacheDir if user-value is given.
// user-provided value has higher precedence than default // user-provided value has higher precedence than default
// and KUBECACHEDIR environment variable. // and KUBECACHEDIR environment variable.
if f.CacheDir != nil && *f.CacheDir != "" { if f.CacheDir != nil && *f.CacheDir != "" && *f.CacheDir != defaultCacheDir {
cacheDir = *f.CacheDir cacheDir = *f.CacheDir
} }
@ -426,7 +426,7 @@ func NewConfigFlags(usePersistentConfig bool) *ConfigFlags {
Timeout: utilpointer.String("0"), Timeout: utilpointer.String("0"),
KubeConfig: utilpointer.String(""), KubeConfig: utilpointer.String(""),
CacheDir: utilpointer.String(""), CacheDir: utilpointer.String(defaultCacheDir),
ClusterName: utilpointer.String(""), ClusterName: utilpointer.String(""),
AuthInfoName: utilpointer.String(""), AuthInfoName: utilpointer.String(""),
Context: utilpointer.String(""), Context: utilpointer.String(""),