From 558dcf3cd42dadeb8b166926b763fa6851ccbab3 Mon Sep 17 00:00:00 2001
From: Sam Leavens <sleavens@suse.com>
Date: Wed, 6 Dec 2017 21:50:50 +0100
Subject: [PATCH] Only show k8s version if asking for server version

---
 cmd/helm/version.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmd/helm/version.go b/cmd/helm/version.go
index a20d6339b..69e0f3905 100644
--- a/cmd/helm/version.go
+++ b/cmd/helm/version.go
@@ -90,14 +90,6 @@ func newVersionCmd(c helm.Interface, out io.Writer) *cobra.Command {
 }
 
 func (v *versionCmd) run() error {
-	if settings.Debug {
-		k8sVersion, err := getK8sVersion()
-		if err != nil {
-			return err
-		}
-		fmt.Fprintf(v.out, "Kubernetes: %#v\n", k8sVersion)
-	}
-
 	if v.showClient {
 		cv := version.GetVersionProto()
 		fmt.Fprintf(v.out, "Client: %s\n", formatVersion(cv, v.short))
@@ -107,6 +99,14 @@ func (v *versionCmd) run() error {
 		return nil
 	}
 
+	if settings.Debug {
+		k8sVersion, err := getK8sVersion()
+		if err != nil {
+			return err
+		}
+		fmt.Fprintf(v.out, "Kubernetes: %#v\n", k8sVersion)
+	}
+
 	resp, err := v.client.GetVersion()
 	if err != nil {
 		if grpc.Code(err) == codes.Unimplemented {