Merge remote-tracking branch 'rancher/master'

Author: Tedyst

go.mod

@@ -3,15 +3,13 @@ module github.com/rancher/helm-controller
 go 1.12
 
 require (
-	github.com/rancher/wrangler v0.1.4
-	github.com/rancher/wrangler-api v0.1.4
-	github.com/sirupsen/logrus v1.4.1
-	github.com/stretchr/testify v1.3.0
-	github.com/urfave/cli v1.20.0
-	k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
-	k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
-	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/klog v0.3.0
+	github.com/rancher/wrangler v0.4.0
+	github.com/rancher/wrangler-api v0.4.0
+	github.com/sirupsen/logrus v1.4.2
+	github.com/stretchr/testify v1.4.0
+	github.com/urfave/cli v1.22.2
+	k8s.io/api v0.17.0
+	k8s.io/apimachinery v0.17.0
+	k8s.io/client-go v0.17.0
+	k8s.io/klog v1.0.0
 )
-
-replace github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009

go.sum

@@ -23,6 +23,7 @@ type HelmChartSpec struct {
 	Repo            string                        `json:"repo,omitempty"`
 	Set             map[string]intstr.IntOrString `json:"set,omitempty"`
 	ValuesContent   string                        `json:"valuesContent,omitempty"`
+	HelmVersion     string                        `json:"helmVersion,omitempty"`
 }
 
 type HelmChartStatus struct {