Merge pull request #11 from Dalee/fix-rollback-command

fix rollback command

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-  - "1.7.x"
+  - "1.8.x"
 
 go_import_path: fuse
 

bin/cmd/apply.go

@@ -185,7 +185,7 @@ func finalizeRollOut(specList *[]kubectl.Deployment, isRolledOut bool) error {
 	fmt.Println("==> Rollout failed, starting undo process...")
 	for _, d := range *rolledList {
 		// get list of replica sets connected to deployment
-		rlist, err := kubectl.CommandReplicaSetListBySelector(d.GetNamespace(), d.GetPodSelector()).RunAndParse()
+		rlist, err := kubectl.CommandReplicaSetListBySelector(d.GetNamespace(), d.GetSelector()).RunAndParse()
 		if err != nil {
 			return err
 		}

pkg/kubectl/types_test.go

@@ -5,6 +5,27 @@ import (
 	"testing"
 )
 
+func CompareStringSlices(l, r []string) bool {
+	if len(l) != len(r) {
+		return false
+	}
+
+	for _, leftItem := range l {
+		found := false
+		for _, rightItem := range r {
+			if leftItem == rightItem {
+				found = true
+			}
+		}
+
+		if !found {
+			return false
+		}
+	}
+
+	return true
+}
+
 func TestNamespace_Type(t *testing.T) {
 	ns := Namespace{
 		Kind: "Namespace",
@@ -87,7 +108,8 @@ func TestDeployment_Type(t *testing.T) {
 	assert.Equal(t, "test-deployment", d.GetName())
 	assert.Equal(t, "3eb259fc-bc6f-11e6-a342-005056ba5444", d.GetUUID())
 	assert.Equal(t, "default/test-deployment", d.GetKey())
-	assert.Equal(t, []string{"project=test-project-2", "project_build=12"}, d.GetPodSelector())
+	assert.True(t, CompareStringSlices([]string{"sample-label1=example1"}, d.GetSelector()))
+	assert.True(t, CompareStringSlices([]string{"project=test-project-2", "project_build=12"}, d.GetPodSelector()))
 	assert.False(t, d.IsReady())
 	assert.Equal(t, "Ready: false, Generation: meta=12 observed=0, Replicas: s=1, u=0, a=0, na=1", d.GetStatusString())