diff --git a/go.mod b/go.mod index d888fc4346..d5c23150b0 100644 --- a/go.mod +++ b/go.mod @@ -98,7 +98,7 @@ require ( github.com/pkg/errors v0.8.1 github.com/rakelkar/gonetsh v0.0.0-20190719023240-501daadcadf8 // indirect github.com/rancher/dynamiclistener v0.2.0 - github.com/rancher/helm-controller v0.4.0 + github.com/rancher/helm-controller v0.4.1-0.20191219210749-b81cad6ffd60 github.com/rancher/kine v0.3.2 github.com/rancher/remotedialer v0.2.0 github.com/rancher/wrangler v0.4.0 diff --git a/go.sum b/go.sum index a0c04022fa..23dd5dcd8a 100644 --- a/go.sum +++ b/go.sum @@ -717,6 +717,8 @@ github.com/rancher/helm-controller v0.3.0 h1:sYRpOiJc4+NmSEkft3lR2pwaEPOrPzZOTo2 github.com/rancher/helm-controller v0.3.0/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw= github.com/rancher/helm-controller v0.4.0 h1:VO7TqMsMWh3TJK7U38LLht1uHiDy0fSYWSywT0bE5lY= github.com/rancher/helm-controller v0.4.0/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw= +github.com/rancher/helm-controller v0.4.1-0.20191219210749-b81cad6ffd60 h1:c4UL7AcwFGoZIit6EoVS9S1ylj4IGhPCtQM23iFXBzA= +github.com/rancher/helm-controller v0.4.1-0.20191219210749-b81cad6ffd60/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw= github.com/rancher/kine v0.3.2 h1:2kP48ojBWVoZ6vlzixc9jc9uKRk7Yn1a7kWoOsJi7Sg= github.com/rancher/kine v0.3.2/go.mod h1:xEMl0tLCva9/9me7mXJ3m9Vo6yqHgC4OU3NiK4CPrGQ= github.com/rancher/kubernetes v1.17.0-k3s.1 h1:g1xvTHOHMJxwWtseblor0gighLRHpL7Bf9MwX8HR3W0= diff --git a/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go b/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go index 6954acc0df..0b42ffcb29 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go +++ b/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go @@ -8,7 +8,6 @@ import ( "os" "sort" - "k8s.io/apimachinery/pkg/types" helmv1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" helmcontroller "github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1" batchcontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1" @@ -24,6 +23,7 @@ import ( meta "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" ) @@ -39,7 +39,7 @@ type Controller struct { } const ( - image = "rancher/klipper-helm:v0.2.0" + image = "rancher/klipper-helm:v0.2.1" label = "helmcharts.helm.cattle.io/chart" name = "helm-controller" ) @@ -204,15 +204,15 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap) { Value: "secret", }, { - Name: "CHART_NAMESPACE", + Name: "CHART_NAMESPACE", Value: chart.Namespace, }, { - Name: "CHART", + Name: "CHART", Value: chart.Spec.Chart, }, { - Name: "HELM_VERSION", + Name: "HELM_VERSION", Value: chart.Spec.HelmVersion, }, }, diff --git a/vendor/modules.txt b/vendor/modules.txt index f3973232bb..f0c55a131f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -711,7 +711,7 @@ github.com/rancher/dynamiclistener/factory github.com/rancher/dynamiclistener/storage/file github.com/rancher/dynamiclistener/storage/kubernetes github.com/rancher/dynamiclistener/storage/memory -# github.com/rancher/helm-controller v0.4.0 +# github.com/rancher/helm-controller v0.4.1-0.20191219210749-b81cad6ffd60 github.com/rancher/helm-controller/pkg/apis/helm.cattle.io github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1 github.com/rancher/helm-controller/pkg/generated/clientset/versioned