Merge pull request #570 from karlkfi/karl-operations

feat: improve event status consistency

Author: k8s-ci-robot

examples/alphaTestExamples/MultipleServices.md

@@ -117,11 +117,10 @@ Destroy one service and make sure that only that service is destroyed and clean-
 ```
 kapply destroy $BASE/wordpress | tee $OUTPUT/status;
 
-expectedOutputLine "service/wordpress deleted"
-
-expectedOutputLine "deployment.apps/wordpress deleted"
-
-expectedOutputLine "2 resource(s) deleted, 0 skipped"
+expectedOutputLine "service/wordpress delete successful"
+expectedOutputLine "deployment.apps/wordpress delete successful"
+expectedOutputLine "delete result: 2 attempted, 2 successful, 0 skipped, 0 failed"
+expectedOutputLine "reconcile result: 2 attempted, 2 successful, 0 skipped, 0 failed, 0 timed out"
 
 # Verify that we still have the mysql resources in the cluster.
 kubectl get all --no-headers --selector=app=mysql | wc -l | xargs | tee $OUTPUT/status

examples/alphaTestExamples/helloapp.md

@@ -174,11 +174,11 @@ Run preview to check which commands will be executed
 ```
 kapply preview $BASE | tee $OUTPUT/status
 
-expectedOutputLine "3 resource(s) applied. 3 created, 0 unchanged, 0 configured, 0 failed"
+expectedOutputLine "apply result: 3 attempted, 3 successful, 0 skipped, 0 failed"
 
 kapply preview $BASE --server-side | tee $OUTPUT/status
 
-expectedOutputLine "3 resource(s) applied. 0 created, 0 unchanged, 0 configured, 0 failed, 3 serverside applied"
+expectedOutputLine "apply result: 3 attempted, 3 successful, 0 skipped, 0 failed"
 
 # Verify that preview didn't create any resources.
 kubectl get all -n hellospace 2>&1 | tee $OUTPUT/status
@@ -222,7 +222,7 @@ kapply apply $BASE --reconcile-timeout=120s --status-events | tee $OUTPUT/status
 
 expectedOutputLine "configmap/the-map2 is Current: Resource is always ready"
 
-expectedOutputLine "configmap/the-map1 pruned"
+expectedOutputLine "configmap/the-map1 prune successful"
 
 # Verify that the new configmap has been created and the old one pruned.
 kubectl get cm -n hellospace --no-headers | awk '{print $1}' | tee $OUTPUT/status
@@ -235,34 +235,30 @@ Clean-up the cluster
 ```
 kapply preview $BASE --destroy | tee $OUTPUT/status
 
-expectedOutputLine "deployment.apps/the-deployment deleted"
-
-expectedOutputLine "configmap/the-map2 deleted"
-
-expectedOutputLine "service/the-service deleted"
+expectedOutputLine "deployment.apps/the-deployment delete successful"
+expectedOutputLine "configmap/the-map2 delete successful"
+expectedOutputLine "service/the-service delete successful"
+expectedOutputLine "delete result: 3 attempted, 3 successful, 0 skipped, 0 failed"
 
 kapply preview $BASE --destroy --server-side | tee $OUTPUT/status
 
-expectedOutputLine "deployment.apps/the-deployment deleted"
-
-expectedOutputLine "configmap/the-map2 deleted"
-
-expectedOutputLine "service/the-service deleted"
+expectedOutputLine "deployment.apps/the-deployment delete successful"
+expectedOutputLine "configmap/the-map2 delete successful"
+expectedOutputLine "service/the-service delete successful"
+expectedOutputLine "delete result: 3 attempted, 3 successful, 0 skipped, 0 failed"
 
 # Verify that preview all resources are still there after running preview.
 kubectl get --no-headers all -n hellospace | wc -l | xargs | tee $OUTPUT/status
 expectedOutputLine "6"
 
 kapply destroy $BASE | tee $OUTPUT/status;
 
-expectedOutputLine "deployment.apps/the-deployment deleted"
-
-expectedOutputLine "configmap/the-map2 deleted"
-
-expectedOutputLine "service/the-service deleted"
-
-expectedOutputLine "3 resource(s) deleted, 0 skipped"
-expectedNotFound "resource(s) pruned"
+expectedOutputLine "deployment.apps/the-deployment delete successful"
+expectedOutputLine "configmap/the-map2 delete successful"
+expectedOutputLine "service/the-service delete successful"
+expectedOutputLine "delete result: 3 attempted, 3 successful, 0 skipped, 0 failed"
+expectedOutputLine "reconcile result: 3 attempted, 3 successful, 0 skipped, 0 failed, 0 timed out"
+expectedNotFound "prune result"
 
 kind delete cluster;
 ```

examples/alphaTestExamples/inventoryNamespace.md

@@ -93,9 +93,10 @@ test-namespace is created first, so the following resources within the namespace
 <!-- @runApply @testE2EAgainstLatestRelease -->
 ```
 kapply apply $BASE --reconcile-timeout=1m | tee $OUTPUT/status
-expectedOutputLine "namespace/test-namespace unchanged"
-expectedOutputLine "configmap/cm-a created"
-expectedOutputLine "2 resource(s) applied. 1 created, 1 unchanged, 0 configured"
+expectedOutputLine "namespace/test-namespace apply successful"
+expectedOutputLine "configmap/cm-a apply successful"
+expectedOutputLine "apply result: 2 attempted, 2 successful, 0 skipped, 0 failed"
+expectedOutputLine "reconcile result: 2 attempted, 2 successful, 0 skipped, 0 failed, 0 timed out"
 
 # There should be only one inventory object
 kubectl get cm -n test-namespace --selector='cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l | tee $OUTPUT/status
@@ -119,7 +120,8 @@ that the subsequent apply does not prune this omitted namespace.
 ```
 rm -f $BASE/test-namespace.yaml
 kapply apply $BASE --reconcile-timeout=1m | tee $OUTPUT/status
-expectedOutputLine "0 resource(s) pruned, 1 skipped"
+expectedOutputLine "prune result: 1 attempted, 0 successful, 1 skipped, 0 failed"
+expectedOutputLine "reconcile result: 1 attempted, 0 successful, 1 skipped, 0 failed, 0 timed out"
 
 # Inventory namespace should still exist
 kubectl get ns test-namespace --no-headers | wc -l | tee $OUTPUT/status

examples/alphaTestExamples/pruneAndDelete.md

@@ -134,8 +134,8 @@ Apply the three resources to the cluster.
 ```
 kapply apply $BASE --reconcile-timeout=1m | tee $OUTPUT/status
 
-expectedOutputLine "3 resource(s) applied. 3 created, 0 unchanged, 0 configured, 0 failed"
-expectedOutputLine "3 resource(s) reconciled, 0 skipped, 0 failed to reconcile, 0 timed out"
+expectedOutputLine "apply result: 3 attempted, 3 successful, 0 skipped, 0 failed"
+expectedOutputLine "reconcile result: 3 attempted, 3 successful, 0 skipped, 0 failed, 0 timed out"
 ```
 
 Use the preview command to show what will happen if we run destroy. This should
@@ -145,10 +145,10 @@ command.
 ```
 kapply preview --destroy $BASE | tee $OUTPUT/status
 
-expectedOutputLine "configmap/firstmap deleted"
+expectedOutputLine "configmap/firstmap delete successful"
 expectedOutputLine 'configmap/secondmap delete skipped: annotation prevents deletion ("cli-utils.sigs.k8s.io/on-remove": "keep")'
 expectedOutputLine 'configmap/thirdmap delete skipped: annotation prevents deletion ("client.lifecycle.config.k8s.io/deletion": "detach")'
-expectedOutputLine "1 resource(s) deleted, 2 skipped"
+expectedOutputLine "delete result: 3 attempted, 1 successful, 2 skipped, 0 failed"
 ```
 
 We run the destroy command and see that the resource without the annotations (firstmap)
@@ -158,17 +158,15 @@ cluster.
 ```
 kapply destroy $BASE | tee $OUTPUT/status
 
-expectedOutputLine "configmap/firstmap deleted"
+expectedOutputLine "configmap/firstmap delete successful"
 expectedOutputLine 'configmap/secondmap delete skipped: annotation prevents deletion ("cli-utils.sigs.k8s.io/on-remove": "keep")'
 expectedOutputLine 'configmap/thirdmap delete skipped: annotation prevents deletion ("client.lifecycle.config.k8s.io/deletion": "detach")'
-expectedOutputLine "1 resource(s) deleted, 2 skipped"
-
-expectedOutputLine "configmap/firstmap reconciled"
+expectedOutputLine "configmap/firstmap reconcile successful"
 expectedOutputLine "configmap/secondmap reconcile skipped"
 expectedOutputLine "configmap/thirdmap reconcile skipped"
-expectedOutputLine "1 resource(s) reconciled, 2 skipped, 0 failed to reconcile, 0 timed out"
-
-expectedNotFound "resource(s) pruned"
+expectedOutputLine "delete result: 3 attempted, 1 successful, 2 skipped, 0 failed"
+expectedOutputLine "reconcile result: 3 attempted, 1 successful, 2 skipped, 0 failed, 0 timed out"
+expectedNotFound "prune result"
 
 kubectl get cm --no-headers | awk '{print $1}' | tee $OUTPUT/status
 expectedOutputLine "secondmap"

examples/alphaTestExamples/pruneBasic.md

@@ -102,9 +102,11 @@ no resources should be pruned.
 <!-- @runApply @testE2EAgainstLatestRelease -->
 ```
 kapply apply $BASE --reconcile-timeout=1m | tee $OUTPUT/status
-expectedOutputLine "configmap/cm-a created"
-expectedOutputLine "configmap/cm-b created"
-expectedOutputLine "configmap/cm-c created"
+expectedOutputLine "configmap/cm-a apply successful"
+expectedOutputLine "configmap/cm-b apply successful"
+expectedOutputLine "configmap/cm-c apply successful"
+expectedOutputLine "apply result: 3 attempted, 3 successful, 0 skipped, 0 failed"
+expectedOutputLine "reconcile result: 3 attempted, 3 successful, 0 skipped, 0 failed, 0 timed out"
 
 # There should be only one inventory object
 kubectl get cm --selector='cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l | tee $OUTPUT/status
@@ -154,11 +156,13 @@ cm-d should be created.
 <!-- @applySecondTime @testE2EAgainstLatestRelease -->
 ```
 kapply apply $BASE --reconcile-timeout=1m | tee $OUTPUT/status
-expectedOutputLine "configmap/cm-a pruned"
-expectedOutputLine "configmap/cm-b unchanged"
-expectedOutputLine "configmap/cm-c unchanged"
-expectedOutputLine "configmap/cm-d created"
-expectedOutputLine "1 resource(s) pruned, 0 skipped"
+expectedOutputLine "configmap/cm-a prune successful"
+expectedOutputLine "configmap/cm-b apply successful"
+expectedOutputLine "configmap/cm-c apply successful"
+expectedOutputLine "configmap/cm-d apply successful"
+expectedOutputLine "apply result: 3 attempted, 3 successful, 0 skipped, 0 failed"
+expectedOutputLine "prune result: 1 attempted, 1 successful, 0 skipped, 0 failed"
+expectedOutputLine "reconcile result: 4 attempted, 4 successful, 0 skipped, 0 failed, 0 timed out"
 
 # There should be only one inventory object
 kubectl get cm --selector='cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l | tee $OUTPUT/status

examples/alphaTestExamples/pruneNamespace.md

@@ -116,11 +116,12 @@ no resources should be pruned.
 <!-- @runApply @testE2EAgainstLatestRelease -->
 ```
 kapply apply $BASE --reconcile-timeout=1m | tee $OUTPUT/status
-expectedOutputLine "namespace/test-namespace created"
-expectedOutputLine "configmap/cm-a created"
-expectedOutputLine "configmap/cm-b created"
-expectedOutputLine "configmap/cm-c created"
-expectedOutputLine "4 resource(s) applied. 4 created, 0 unchanged, 0 configured"
+expectedOutputLine "namespace/test-namespace apply successful"
+expectedOutputLine "configmap/cm-a apply successful"
+expectedOutputLine "configmap/cm-b apply successful"
+expectedOutputLine "configmap/cm-c apply successful"
+expectedOutputLine "apply result: 4 attempted, 4 successful, 0 skipped, 0 failed"
+expectedOutputLine "reconcile result: 4 attempted, 4 successful, 0 skipped, 0 failed, 0 timed out"
 
 # There should be only one inventory object
 kubectl get cm --selector='cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l | tee $OUTPUT/status
@@ -172,19 +173,20 @@ test-namespace should **not** be pruned.
 kapply apply $BASE --reconcile-timeout=1m | tee $OUTPUT/status
 
 expectedOutputLine "configmap/cm-c apply skipped: dependency scheduled for delete: _test-namespace__Namespace"
-expectedOutputLine "1 resource(s) applied. 0 created, 1 unchanged, 0 configured, 0 failed"
 expectedOutputLine "configmap/cm-c reconcile skipped"
 
-expectedOutputLine "configmap/cm-a pruned"
-expectedOutputLine "configmap/cm-b pruned"
+expectedOutputLine "configmap/cm-a prune successful"
+expectedOutputLine "configmap/cm-b prune successful"
 expectedOutputLine "namespace/test-namespace prune skipped: namespace still in use: test-namespace"
-expectedOutputLine "2 resource(s) pruned, 1 skipped, 0 failed to prune"
 
 expectedOutputLine "namespace/test-namespace reconcile skipped"
-expectedOutputLine "configmap/cm-a reconciled"
-expectedOutputLine "configmap/cm-b reconciled"
+expectedOutputLine "configmap/cm-a reconcile successful"
+expectedOutputLine "configmap/cm-b reconcile successful"
 expectedOutputLine "configmap/cm-c reconcile skipped"
-expectedOutputLine "2 resource(s) reconciled, 2 skipped, 0 failed to reconcile, 0 timed out"
+
+expectedOutputLine "apply result: 1 attempted, 0 successful, 1 skipped, 0 failed"
+expectedOutputLine "prune result: 3 attempted, 2 successful, 1 skipped, 0 failed"
+expectedOutputLine "reconcile result: 4 attempted, 2 successful, 2 skipped, 0 failed, 0 timed out"
 
 # The test-namespace should not be pruned.
 kubectl get ns test-namespace --no-headers | wc -l | tee $OUTPUT/status

examples/alphaTestExamples/serverSideApply.md

@@ -93,9 +93,10 @@ no resources should be pruned.
 <!-- @runServerSideApply @testE2EAgainstLatestRelease -->
 ```
 kapply apply $BASE --server-side --reconcile-timeout=1m | tee $OUTPUT/status
-expectedOutputLine "configmap/cm-a serversideapplied"
-expectedOutputLine "configmap/cm-b serversideapplied"
-expectedOutputLine "2 serverside applied"
+expectedOutputLine "configmap/cm-a apply successful"
+expectedOutputLine "configmap/cm-b apply successful"
+expectedOutputLine "apply result: 2 attempted, 2 successful, 0 skipped, 0 failed"
+expectedOutputLine "reconcile result: 2 attempted, 2 successful, 0 skipped, 0 failed, 0 timed out"
 
 # There should be only one inventory object
 kubectl get cm --selector='cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l | tee $OUTPUT/status
@@ -129,7 +130,8 @@ data:
 EOF
 
 kapply apply $BASE --server-side --field-manager=sean --force-conflicts --reconcile-timeout=1m | tee $OUTPUT/status
-expectedOutputLine "configmap/cm-a serversideapplied"
-expectedOutputLine "configmap/cm-b serversideapplied"
-expectedOutputLine "2 serverside applied"
+expectedOutputLine "configmap/cm-a apply successful"
+expectedOutputLine "configmap/cm-b apply successful"
+expectedOutputLine "apply result: 2 attempted, 2 successful, 0 skipped, 0 failed"
+expectedOutputLine "reconcile result: 2 attempted, 2 successful, 0 skipped, 0 failed, 0 timed out"
 ```