Added Kustomize, Helm, and Kubectl to argocd version (argoproj#2329)

tkasuz · Oct 4, 2019 · f185137 · f185137
1 parent c3479b8
commit f185137
Show file tree

Hide file tree

Showing 15 changed files with 355 additions and 54 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/assets/swagger.json b/assets/swagger.json
@@ -4124,9 +4124,18 @@
         "GoVersion": {
           "type": "string"
         },
+        "HelmVersion": {
+          "type": "string"
+        },
         "KsonnetVersion": {
           "type": "string"
         },
+        "KubectlVersion": {
+          "type": "string"
+        },
+        "KustomizeVersion": {
+          "type": "string"
+        },
         "Platform": {
           "type": "string"
         },

diff --git a/cmd/argocd/commands/version.go b/cmd/argocd/commands/version.go
@@ -56,6 +56,9 @@ func NewVersionCmd(clientOpts *argocdclient.ClientOptions) *cobra.Command {
 				fmt.Printf("  Compiler: %s\n", serverVers.Compiler)
 				fmt.Printf("  Platform: %s\n", serverVers.Platform)
 				fmt.Printf("  Ksonnet Version: %s\n", serverVers.KsonnetVersion)
+				fmt.Printf("  Kustomize Version: %s\n", serverVers.KustomizeVersion)
+				fmt.Printf("  Helm Version: %s\n", serverVers.HelmVersion)
+				fmt.Printf("  Kubectl Version: %s\n", serverVers.KubectlVersion)
 			}
 
 		},

diff --git a/pkg/apiclient/version/version.pb.go b/pkg/apiclient/version/version.pb.go
diff --git a/resource_customizations/custom_actions_test.go b/resource_customizations/custom_actions_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bouk/monkey"
+	"bou.ke/monkey"
 	"github.com/ghodss/yaml"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"