Merge pull request #206 from westonsteimel/no_runningversion_if_version_set

Only get runningVersion if --version has not been provided
This commit is contained in:
Liz Rice
2019-01-24 12:00:59 +01:00
committed by GitHub
+6 -3
View File
@@ -44,9 +44,12 @@ func runChecks(nodetype check.NodeType) {
file = federatedFile
}
runningVersion, err := getKubeVersion()
if err != nil && kubeVersion == "" {
exitWithError(fmt.Errorf("Version check failed: %s\nAlternatively, you can specify the version with --version", err))
runningVersion := ""
if kubeVersion == "" {
runningVersion, err = getKubeVersion()
if err != nil {
exitWithError(fmt.Errorf("Version check failed: %s\nAlternatively, you can specify the version with --version", err))
}
}
path, err := getConfigFilePath(kubeVersion, runningVersion, file)
if err != nil {