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

Increase default value of cache TTL to 6 hours.

Browse Source
This commit is contained in:
Manish Kumar 2021-12-20 18:09:59 +05:30
parent 52cd4d53ac
commit 94f7f92205
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/cli-runtime/go.mod
View File

@ -21,6 +21,7 @@ require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
sigs.k8s.io/kustomize/api v0.10.1 sigs.k8s.io/kustomize/api v0.10.1
sigs.k8s.io/kustomize/kyaml v0.13.0 sigs.k8s.io/kustomize/kyaml v0.13.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0

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

@ -33,6 +33,7 @@ import (
"k8s.io/client-go/restmapper" "k8s.io/client-go/restmapper"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/util/homedir" "k8s.io/client-go/util/homedir"
utilpointer "k8s.io/utils/pointer"
) )
const ( const (
@ -284,7 +285,7 @@ func (f *ConfigFlags) toDiscoveryClient() (discovery.CachedDiscoveryInterface, e
httpCacheDir := filepath.Join(cacheDir, "http") httpCacheDir := filepath.Join(cacheDir, "http")
discoveryCacheDir := computeDiscoverCacheDir(filepath.Join(cacheDir, "discovery"), config.Host) discoveryCacheDir := computeDiscoverCacheDir(filepath.Join(cacheDir, "discovery"), config.Host)
return diskcached.NewCachedDiscoveryClientForConfig(config, discoveryCacheDir, httpCacheDir, time.Duration(10*time.Minute)) return diskcached.NewCachedDiscoveryClientForConfig(config, discoveryCacheDir, httpCacheDir, time.Duration(6*time.Hour))
} }
// ToRESTMapper returns a mapper. // ToRESTMapper returns a mapper.
@ -386,8 +387,8 @@ func (f *ConfigFlags) AddFlags(flags *pflag.FlagSet) {
// WithDeprecatedPasswordFlag enables the username and password config flags // WithDeprecatedPasswordFlag enables the username and password config flags
func (f *ConfigFlags) WithDeprecatedPasswordFlag() *ConfigFlags { func (f *ConfigFlags) WithDeprecatedPasswordFlag() *ConfigFlags {
f.Username = stringptr("") f.Username = utilpointer.String("")
f.Password = stringptr("") f.Password = utilpointer.String("")
return f return f
} }
@ -416,22 +417,22 @@ func NewConfigFlags(usePersistentConfig bool) *ConfigFlags {
return &ConfigFlags{ return &ConfigFlags{
Insecure: &insecure, Insecure: &insecure,
Timeout: stringptr("0"), Timeout: utilpointer.String("0"),
KubeConfig: stringptr(""), KubeConfig: utilpointer.String(""),
CacheDir: stringptr(defaultCacheDir), CacheDir: utilpointer.String(defaultCacheDir),
ClusterName: stringptr(""), ClusterName: utilpointer.String(""),
AuthInfoName: stringptr(""), AuthInfoName: utilpointer.String(""),
Context: stringptr(""), Context: utilpointer.String(""),
Namespace: stringptr(""), Namespace: utilpointer.String(""),
APIServer: stringptr(""), APIServer: utilpointer.String(""),
TLSServerName: stringptr(""), TLSServerName: utilpointer.String(""),
CertFile: stringptr(""), CertFile: utilpointer.String(""),
KeyFile: stringptr(""), KeyFile: utilpointer.String(""),
CAFile: stringptr(""), CAFile: utilpointer.String(""),
BearerToken: stringptr(""), BearerToken: utilpointer.String(""),
Impersonate: stringptr(""), Impersonate: utilpointer.String(""),
ImpersonateUID: stringptr(""), ImpersonateUID: utilpointer.String(""),
ImpersonateGroup: &impersonateGroup, ImpersonateGroup: &impersonateGroup,
usePersistentConfig: usePersistentConfig, usePersistentConfig: usePersistentConfig,
@ -442,10 +443,6 @@ func NewConfigFlags(usePersistentConfig bool) *ConfigFlags {
} }
} }
func stringptr(val string) *string {
return &val
}
// overlyCautiousIllegalFileCharacters matches characters that *might* not be supported. Windows is really restrictive, so this is really restrictive // overlyCautiousIllegalFileCharacters matches characters that *might* not be supported. Windows is really restrictive, so this is really restrictive
var overlyCautiousIllegalFileCharacters = regexp.MustCompile(`[^(\w/.)]`) var overlyCautiousIllegalFileCharacters = regexp.MustCompile(`[^(\w/.)]`)