From 937c7677a27450cc29c9076fe7dad5a67f86a211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= Date: Fri, 29 Apr 2022 13:43:42 +0300 Subject: [PATCH] Only handle if defaultCacheDir is changed --- .../k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go b/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go index 63af224d098..fe63cbb9a9d 100644 --- a/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go +++ b/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go @@ -284,7 +284,7 @@ func (f *ConfigFlags) toDiscoveryClient() (discovery.CachedDiscoveryInterface, e // override httpCacheDir and discoveryCacheDir if user-value is given. // user-provided value has higher precedence than default // and KUBECACHEDIR environment variable. - if f.CacheDir != nil && *f.CacheDir != "" { + if f.CacheDir != nil && *f.CacheDir != "" && *f.CacheDir != defaultCacheDir { cacheDir = *f.CacheDir } @@ -426,7 +426,7 @@ func NewConfigFlags(usePersistentConfig bool) *ConfigFlags { Timeout: utilpointer.String("0"), KubeConfig: utilpointer.String(""), - CacheDir: utilpointer.String(""), + CacheDir: utilpointer.String(defaultCacheDir), ClusterName: utilpointer.String(""), AuthInfoName: utilpointer.String(""), Context: utilpointer.String(""),