configmap-e2e: use labels

Author: roycaihw

kubernetes/e2e_test/test_client.py

@@ -443,6 +443,9 @@ def test_configmap_apis(self):
             "apiVersion": "v1",
             "metadata": {
                 "name": name,
+                "labels": {
+                    "e2e-test": "true",
+                },
             },
             "data": {
                 "config.json": "{\"command\":\"/usr/bin/mysqld_safe\"}",
@@ -466,7 +469,7 @@ def test_configmap_apis(self):
         resp = api.delete_namespaced_config_map(
             name=name, body={}, namespace='default')
 
-        resp = api.list_namespaced_config_map('default', pretty=True)
+        resp = api.list_namespaced_config_map('default', pretty=True, label_selector="e2e-test=true")
         self.assertEqual([], resp.items)
 
     def test_node_apis(self):

kubernetes/e2e_test/test_watch.py

@@ -32,6 +32,9 @@ def config_map_with_value(name, value):
         "kind": "ConfigMap",
         "metadata": {
             "name": name,
+            "labels": {
+                "e2e-test": "true",
+            },
         },
         "data": {
             "key": value,
@@ -57,7 +60,7 @@ def test_watch_configmaps(self):
             body=configmap_a, namespace='default')
 
         # list all configmaps and extract the resource version
-        resp = api.list_namespaced_config_map('default')
+        resp = api.list_namespaced_config_map('default', label_selector="e2e-test=true")
         rv = resp.metadata.resource_version
 
         # create another configmap
@@ -73,7 +76,7 @@ def test_watch_configmaps(self):
 
         # delete all configmaps
         api.delete_collection_namespaced_config_map(
-            namespace='default')
+            namespace='default', label_selector="e2e-test=true")
 
         w = watch.Watch()
         # expect to observe all events happened after the initial LIST
@@ -83,7 +86,8 @@ def test_watch_configmaps(self):
         for event in w.stream(api.list_namespaced_config_map,
                               namespace='default',
                               resource_version=rv,
-                              timeout_seconds=5):
+                              timeout_seconds=5,
+                              label_selector="e2e-test=true"):
             self.assertEqual(event['type'], expect[i])
             # Kubernetes doesn't guarantee the order of the two objects
             # being deleted