Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #72454 from rojkov/kubeadm-fallback-version
kubeadm: add final fallback to constants.CurrentKubernetesVersion
  • Loading branch information
k8s-ci-robot committed Mar 27, 2019
2 parents a8cbb22 + 9e25a00 commit 5a6c66a
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions cmd/kubeadm/app/util/version.go
Expand Up @@ -29,6 +29,7 @@ import (
netutil "k8s.io/apimachinery/pkg/util/net"
versionutil "k8s.io/apimachinery/pkg/util/version"
"k8s.io/klog"
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
pkgversion "k8s.io/kubernetes/pkg/version"
)

Expand Down Expand Up @@ -92,13 +93,20 @@ func KubernetesReleaseVersion(version string) (string, error) {
if body != "" {
return "", err
}
// Handle air-gapped environments by falling back to the client version.
klog.Infof("could not fetch a Kubernetes version from the internet: %v", err)
klog.Infof("falling back to the local client version: %s", clientVersion)
return KubernetesReleaseVersion(clientVersion)
if clientVersionErr == nil {
// Handle air-gapped environments by falling back to the client version.
klog.Warningf("could not fetch a Kubernetes version from the internet: %v", err)
klog.Warningf("falling back to the local client version: %s", clientVersion)
return KubernetesReleaseVersion(clientVersion)
}
}

if clientVersionErr != nil {
if err != nil {
klog.Warningf("could not obtain neither client nor remote version; fall back to: %s", constants.CurrentKubernetesVersion)
return KubernetesReleaseVersion(constants.CurrentKubernetesVersion.String())
}

klog.Warningf("could not obtain client version; using remote version: %s", body)
return KubernetesReleaseVersion(body)
}
Expand Down

0 comments on commit 5a6c66a

Please sign in to comment.