Skip to content

K
k3s
Commit 313ef639 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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.
parents 2d9d84dc 54f5a9b4
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
pkg/kubectl/cmd/util/factory.go
View file @ 313ef639
...@@ -697,10 +697,11 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory { ...@@ -697,10 +697,11 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
dir := cacheDir dir := cacheDir
if len(dir) > 0 { if len(dir) > 0 {
version, err := clientset.Discovery().ServerVersion() version, err := clientset.Discovery().ServerVersion()
if err != nil { if err == nil {
return nil, err dir = path.Join(cacheDir, version.String())
} else {
dir = "" // disable caching as a fallback
} }
dir = path.Join(cacheDir, version.String())
} }
fedClient, err := clients.FederationClientForVersion(nil) fedClient, err := clients.FederationClientForVersion(nil)
if err != nil { if err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment