diff --git a/tool/tsh/common/kube.go b/tool/tsh/common/kube.go index e34dfde476f12..eb538f067efb2 100644 --- a/tool/tsh/common/kube.go +++ b/tool/tsh/common/kube.go @@ -727,7 +727,12 @@ func (c *kubeCredentialsCommand) issueCert(cf *CLIConf) error { if cf.MockSSOLogin != nil { lockTimeout = utils.FSLockRetryDelay } - unlockKubeCred, err = takeKubeCredLock(cf.Context, cf.HomePath, cf.Proxy, lockTimeout) + proxy := cf.Proxy + // if proxy is empty, fallback to WebProxyAddr + if proxy == "" { + proxy = tc.WebProxyAddr + } + unlockKubeCred, err = takeKubeCredLock(cf.Context, cf.HomePath, proxy, lockTimeout) return trace.Wrap(err) }, ),