arno/kube-bench
1
0
Fork 0
mirror of https://github.com/aquasecurity/kube-bench.git synced 2024-11-15 20:39:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into bugfix/docker-entrypoint-fail-on-error

Browse Source
This commit is contained in:
Liz Rice 2018-05-11 19:25:38 +01:00 committed by GitHub
commit 5eb4ab7479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/util.go
View File

@ -219,7 +219,7 @@ func getKubeVersion() string {
if err != nil { if err != nil {
_, err = exec.LookPath("kubelet") _, err = exec.LookPath("kubelet")
if err != nil { if err != nil {
exitWithError(fmt.Errorf("Version check failed: need kubectl or kubelet binaries to get kubernetes version")) exitWithError(fmt.Errorf("Version check failed: need kubectl or kubelet binaries to get kubernetes version.\nAlternately, you can specify the version with --version"))
} }
return getKubeVersionFromKubelet() return getKubeVersionFromKubelet()
} }
@ -240,7 +240,7 @@ func getKubeVersionFromKubectl() string {
func getKubeVersionFromKubelet() string { func getKubeVersionFromKubelet() string {
cmd := exec.Command("kubelet", "--version") cmd := exec.Command("kubelet", "--version")
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
continueWithError(fmt.Errorf("%s", out), "") continueWithError(fmt.Errorf("%s", out), "")
} }