github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #32680 from sttts/sttts-gracefully-kubectl-without-version 

Automatic merge from submit-queue

Behave gracefully in kubectl if /version returns 404

Fixes https://github.com/kubernetes/kubernetes/issues/32679. 

It's only about caching the swagger spec here. So it's safe to fall back to non-caching mode and continue.
pull/6/head
Kubernetes Submit Queue 2016-09-21 04:59:16 -07:00 committed by GitHub
parent 2d9d84dc64 54f5a9b423
commit 313ef63993
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubectl/cmd/util/factory.go
View File

@ -697,10 +697,11 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
dir := cacheDir
if len(dir) > 0 {
version, err := clientset.Discovery().ServerVersion()
if err != nil {
return nil, err
if err == nil {
dir = path.Join(cacheDir, version.String())
} else {
dir = "" // disable caching as a fallback
}
dir = path.Join(cacheDir, version.String())
}
fedClient, err := clients.FederationClientForVersion(nil)
if err != nil {