Fix flaky e2e test (#2622)

Author: mortent

e2e/testdata/live-apply/json-output/config.yaml

@@ -18,9 +18,8 @@ kptArgs:
   - "--reconcile-timeout=1m"
 stdOut: |
   {"eventType":"resourceApplied","group":"","kind":"ConfigMap","name":"cm","namespace":"json-output","operation":"Created","timestamp":"<TIMESTAMP>","type":"apply"}
-  {"eventType":"resourceApplied","group":"apps","kind":"Deployment","name":"third-nginx","namespace":"json-output","operation":"Created","timestamp":"<TIMESTAMP>","type":"apply"}
-  {"configuredCount":0,"count":2,"createdCount":2,"eventType":"completed","failedCount":0,"serverSideCount":0,"timestamp":"<TIMESTAMP>","type":"apply","unchangedCount":0}
-  {"eventType":"resourceApplied","group":"apps","kind":"Deployment","name":"fourth-nginx","namespace":"json-output","operation":"Created","timestamp":"<TIMESTAMP>","type":"apply"}
+  {"configuredCount":0,"count":1,"createdCount":1,"eventType":"completed","failedCount":0,"serverSideCount":0,"timestamp":"<TIMESTAMP>","type":"apply","unchangedCount":0}
+  {"eventType":"resourceApplied","group":"apps","kind":"Deployment","name":"nginx","namespace":"json-output","operation":"Created","timestamp":"<TIMESTAMP>","type":"apply"}
   {"configuredCount":0,"count":1,"createdCount":1,"eventType":"completed","failedCount":0,"serverSideCount":0,"timestamp":"<TIMESTAMP>","type":"apply","unchangedCount":0}
   {"eventType":"resourcePruned","group":"apps","kind":"Deployment","name":"second-nginx","namespace":"json-output","operation":"Pruned","timestamp":"<TIMESTAMP>","type":"prune"}
   {"eventType":"completed","pruned":1,"skipped":0,"timestamp":"<TIMESTAMP>","type":"prune"}
@@ -32,9 +31,5 @@ inventory:
     namespace: json-output
   - group: apps
     kind: Deployment
-    name: third-nginx
-    namespace: json-output
-  - group: apps
-    kind: Deployment
-    name: fourth-nginx
+    name: nginx
     namespace: json-output

e2e/testdata/live-apply/json-output/resources/third.yaml renamed to e2e/testdata/live-apply/json-output/resources/dep.yaml

@@ -15,19 +15,19 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: third-nginx
+  name: nginx
   namespace: json-output
   annotations:
-    config.k8s.io/owning-inventory: json-output
+    config.kubernetes.io/depends-on: apps/namespaces/json-output/ConfigMap/cm
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: third-nginx
+      app: nginx
   template:
     metadata:
       labels:
-        app: third-nginx
+        app: nginx
     spec:
       containers:
         - name: nginx