Test update propagation

Test the upgrade path through controllers.
bpineau · Apr 26, 2018 · 1720692 · 1720692
1 parent fe136d3
commit 1720692
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -73,7 +73,7 @@ func New(client cache.ListerWatcher,
 	excluded []string,
 ) *Controller {
 
-	selector := metav1.ListOptions{LabelSelector: filter}
+	selector := metav1.ListOptions{LabelSelector: filter, ResourceVersion: "0"}
 	lw := &cache.ListWatch{
 		ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
 			return client.List(selector)

diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
@@ -67,7 +67,39 @@ var (
 			"metadata": map[string]interface{}{
 				"name":            "Bar3",
 				"namespace":       "ns3",
-				"resourceVersion": 1,
+				"resourceVersion": "1",
+				"uid":             "00000000-0000-0000-0000-000000000042",
+				"selfLink":        "shouldnotbethere",
+			},
+			"status": "shouldnotbethere",
+		},
+	}
+
+	obj4 = &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Foo2",
+			"metadata": map[string]interface{}{
+				"name":            "Bar4",
+				"namespace":       "ns4",
+				"resourceVersion": "2",
+				"foo":             "canary-bar4",
+				"uid":             "00000000-0000-0000-0000-000000000042",
+				"selfLink":        "shouldnotbethere",
+			},
+			"status": "shouldnotbethere",
+		},
+	}
+
+	obj5 = &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Foo2",
+			"metadata": map[string]interface{}{
+				"name":            "Bar4",
+				"namespace":       "ns4",
+				"ResourceVersion": "4",
+				"foo":             "canary-bar5",
 				"uid":             "00000000-0000-0000-0000-000000000042",
 				"selfLink":        "shouldnotbethere",
 			},
@@ -95,6 +127,8 @@ func TestController(t *testing.T) {
 
 	client.Add(obj2)
 	client.Add(obj3)
+	client.Add(obj4)
+	client.Modify(obj5)
 
 	ctrl.Start()
 	// wait until queue is drained
@@ -123,6 +157,11 @@ func TestController(t *testing.T) {
 		if strings.Compare(ev.Key, "ns3/Bar3") == 0 {
 			t.Error("execludedobject filter failed")
 		}
+
+		// ensure updates propagate
+		if strings.Contains(string(ev.Object), "canary-bar4") {
+			t.Error("update didn't propagate")
+		}
 	}
 
 	if !gotFoo2 {