e2e review fixes

e2e/helm_client.go

@@ -84,7 +84,7 @@ func (m *BinaryHelmManager) InstallTiller() error {
 }
 
 func (m *BinaryHelmManager) DeleteTiller(removeHelmHome bool) error {
-	arg := make([]string, 0, 4)
+	arg := []string{}
 	arg = append(arg, "reset", "--tiller-namespace", m.Namespace, "--force")
 	if removeHelmHome {
 		arg = append(arg, "--remove-helm-home")
@@ -172,14 +172,8 @@ func (m *BinaryHelmManager) executeCommandWithValues(releaseName, command string
 	arg := make([]string, 0, 8)
 	arg = append(arg, command, releaseName)
 	if len(values) > 0 {
-		var b bytes.Buffer
+		vals := prepareArgsFromValues(values)
-		for key, val := range values {
+		arg = append(arg, "--set", vals)
-			b.WriteString(key)
-			b.WriteString("=")
-			b.WriteString(val)
-			b.WriteString(",")
-		}
-		arg = append(arg, "--set", b.String())
 	}
 	return m.executeUsingHelmInNamespace(arg...)
 }

e2e/utils.go

@@ -18,10 +18,6 @@ package e2e
 import (
 	"flag"
 	"fmt"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -29,6 +25,9 @@ import (
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 )
 
 var url string
@@ -58,12 +57,8 @@ func KubeClient() (*kubernetes.Clientset, error) {
 
 func DeleteNS(clientset kubernetes.Interface, namespace *v1.Namespace) {
 	defer GinkgoRecover()
-	pods, err := clientset.Core().Pods(namespace.Name).List(metav1.ListOptions{})
+	err := clientset.Core().Namespaces().Delete(namespace.Name, nil)
 	Expect(err).NotTo(HaveOccurred())
-	for _, pod := range pods.Items {
-		clientset.Core().Pods(namespace.Name).Delete(pod.Name, nil)
-	}
-	clientset.Core().Namespaces().Delete(namespace.Name, nil)
 }
 
 func Logf(format string, a ...interface{}) {