diff --git a/go.mod b/go.mod index 3344c052e6..0dd78d4821 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.1-0.20191223195946-ae918063bc54 + github.com/rancher/helm-controller v0.4.1 github.com/rancher/kine v0.3.3 github.com/rancher/remotedialer v0.2.0 github.com/rancher/wrangler v0.4.0 diff --git a/go.sum b/go.sum index 08675ac95a..0783bda4a9 100644 --- a/go.sum +++ b/go.sum @@ -715,8 +715,8 @@ github.com/rancher/dynamiclistener v0.2.0 h1:KucYwJXVVGhZ/NndfMCeQoCafT/VN7kvqSG github.com/rancher/dynamiclistener v0.2.0/go.mod h1:fs/dxyNcB3YT6W9fVz4bDGfhmSQS17QQup6BIcGF++s= github.com/rancher/flannel v0.11.0-k3s.1 h1:mIwnfWDafjzQgFkZeJ1AkFrrAT3EdBaA1giE0eLJKo8= github.com/rancher/flannel v0.11.0-k3s.1/go.mod h1:Hn4ZV+eq0LhLZP63xZnxdGwXEoRSxs5sxELxu27M3UA= -github.com/rancher/helm-controller v0.4.1-0.20191223195946-ae918063bc54 h1:S/IAloMp6MYYtoHKfJUS5M3Wv0CU+5Ixe1nnSv2pQUU= -github.com/rancher/helm-controller v0.4.1-0.20191223195946-ae918063bc54/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw= +github.com/rancher/helm-controller v0.4.1 h1:AbI3zXy2Qtw4e4A6IkxKozgnm6T3KKnUo6EzD1Pz0aU= +github.com/rancher/helm-controller v0.4.1/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw= github.com/rancher/kine v0.3.3 h1:FTOQN1qHQMzMfA8/nd9/rWfdR3Xk4PbXcOqw5P3dJDw= github.com/rancher/kine v0.3.3/go.mod h1:xEMl0tLCva9/9me7mXJ3m9Vo6yqHgC4OU3NiK4CPrGQ= github.com/rancher/kubernetes v1.17.1-k3s.1 h1:dwL66NxvK0B5oaoHfxBHWf0Q7ejZt7RlyyT8RrwdfQI= diff --git a/scripts/airgap/image-list.txt b/scripts/airgap/image-list.txt index 7ad2e038c4..e939376875 100644 --- a/scripts/airgap/image-list.txt +++ b/scripts/airgap/image-list.txt @@ -1,6 +1,6 @@ docker.io/coredns/coredns:1.6.3 docker.io/library/traefik:1.7.19 -docker.io/rancher/klipper-helm:v0.2.2 +docker.io/rancher/klipper-helm:v0.2.3 docker.io/rancher/klipper-lb:v0.1.2 docker.io/rancher/local-path-provisioner:v0.0.11 docker.io/rancher/metrics-server:v0.3.6 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 e4a7e3234d..cc589b4e74 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go +++ b/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go @@ -39,7 +39,7 @@ type Controller struct { } const ( - image = "rancher/klipper-helm:v0.2.2" + image = "rancher/klipper-helm:v0.2.3" label = "helmcharts.helm.cattle.io/chart" name = "helm-controller" ) @@ -333,7 +333,9 @@ func args(chart *helmv1.HelmChart) []string { for _, k := range keys(spec.Set) { val := spec.Set[k] - if val.StrVal != "" { + if val.StrVal == "false" || val.StrVal == "true" { + args = append(args, "--set", fmt.Sprintf("%s=%s", k, val.StrVal)) + } else if val.StrVal != "" { args = append(args, "--set-string", fmt.Sprintf("%s=%s", k, val.StrVal)) } else { args = append(args, "--set", fmt.Sprintf("%s=%d", k, val.IntVal)) diff --git a/vendor/modules.txt b/vendor/modules.txt index ab35833dca..5b580ad02e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -712,7 +712,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.1-0.20191223195946-ae918063bc54 +# github.com/rancher/helm-controller v0.4.1 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