Merge pull request #26 from Tedyst/master

Distinguish between booleans and strings correctly

Author: erikwilson

pkg/helm/controller.go

@@ -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))

pkg/helm/controller_test.go

@@ -32,7 +32,7 @@ func TestDeleteJob(t *testing.T) {
 func TestInstallArgs(t *testing.T) {
 	assert := assert.New(t)
 	stringArgs := strings.Join(args(NewChart()), " ")
-	assert.Equal("install --set-string rbac.enabled=true --set-string ssl.enabled=true", stringArgs)
+	assert.Equal("install --set-string acme.dnsProvider.name=cloudflare --set rbac.enabled=true --set ssl.enabled=false", stringArgs)
 }
 
 func TestDeleteArgs(t *testing.T) {
@@ -47,7 +47,8 @@ func TestDeleteArgs(t *testing.T) {
 func NewChart() *v1.HelmChart {
 	var set = make(map[string]intstr.IntOrString)
 	set["rbac.enabled"] = intstr.IntOrString{StrVal: "true"}
-	set["ssl.enabled"] = intstr.IntOrString{StrVal: "true"}
+	set["ssl.enabled"] = intstr.IntOrString{StrVal: "false"}
+	set["acme.dnsProvider.name"] = intstr.IntOrString{StrVal: "cloudflare"}
 
 	return v1.NewHelmChart("kube-system", "traefik", v1.HelmChart{
 		Spec: v1.HelmChartSpec{