rename error reason to AddedOrUpdatedWithError

Signed-off-by: Haywood Shannon <[email protected]>

Signed-off-by: Haywood Shannon <[email protected]>

Author: haywoodsh

docs/content/configuration/global-configuration/globalconfiguration-resource.md

@@ -148,7 +148,7 @@ Events:
   Type     Reason    Age   From                      Message
   ----     ------    ----  ----                      -------
   Normal   Updated   55s   nginx-ingress-controller  GlobalConfiguration nginx-ingress/nginx-configuration was updated
-  Warning  WithError  6s    nginx-ingress-controller  GlobalConfiguration nginx-ingress/nginx-configuration is invalid and was rejected: spec.listeners: Duplicate value: "Duplicated port/protocol combination 53/UDP"
+  Warning  AddedOrUpdatedWithError  6s    nginx-ingress-controller  GlobalConfiguration nginx-ingress/nginx-configuration is invalid and was rejected: spec.listeners: Duplicate value: "Duplicated port/protocol combination 53/UDP"
 ```
 
-Note how the events section includes a Warning event with the WithError reason.
+Note how the events section includes a Warning event with the AddedOrUpdatedWithError reason.

internal/k8s/controller.go

@@ -1566,7 +1566,7 @@ func (lbc *LoadBalancerController) syncGlobalConfiguration(task task) {
 		eventMessage := fmt.Sprintf("GlobalConfiguration %s was added or updated", key)
 
 		if validationErr != nil {
-			eventTitle = "WithError"
+			eventTitle = "AddedOrUpdatedWithError"
 			eventType = api_v1.EventTypeWarning
 			eventMessage = fmt.Sprintf("GlobalConfiguration %s is updated with errors: %v", key, validationErr)
 		}

tests/suite/test_transport_server_status.py

@@ -79,7 +79,6 @@ def test_status_warning(
             transport_server_setup.name,
         )
         self.restore_ts(kube_apis, transport_server_setup)
-        print(response)
         assert (
             response["status"]
             and response["status"]["reason"] == "Rejected"
@@ -152,12 +151,11 @@ def test_valid_status_invalid_udp_listener(self, kube_apis, crd_ingress_controll
         gc_event_latest = gc_events[-1]
         print(gc_event_latest)
         assert (
-            gc_event_latest.reason == "WithError"
+            gc_event_latest.reason == "AddedOrUpdatedWithError"
             and gc_event_latest.type == "Warning"
             and "GlobalConfiguration nginx-ingress/nginx-configuration is updated with errors: "
             "spec.listeners[0].port: Forbidden: Listener dns-udp: port 9113 is forbidden" in gc_event_latest.message
         )
-        wait_before_test()
 
     def test_valid_status_invalid_tcp_listener(self, kube_apis, crd_ingress_controller, transport_server_setup):
         """
@@ -191,9 +189,8 @@ def test_valid_status_invalid_tcp_listener(self, kube_apis, crd_ingress_controll
         gc_event_latest = gc_events[-1]
         print(gc_event_latest)
         assert (
-            gc_event_latest.reason == "WithError"
+            gc_event_latest.reason == "AddedOrUpdatedWithError"
             and gc_event_latest.type == "Warning"
             and "GlobalConfiguration nginx-ingress/nginx-configuration is updated with errors: "
             "spec.listeners[1].port: Forbidden: Listener dns-tcp: port 9113 is forbidden" in gc_event_latest.message
         )
-        wait_before_test()

tests/suite/test_virtual_server_custom_listeners.py

@@ -283,7 +283,7 @@ def test_custom_listeners(
             print(gc_event_latest)
             if test_setup["expected_gc_error_msg"]:
                 assert (
-                    gc_event_latest.reason == "WithError"
+                    gc_event_latest.reason == "AddedOrUpdatedWithError"
                     and gc_event_latest.type == "Warning"
                     and test_setup["expected_gc_error_msg"] in gc_event_latest.message
                 )
@@ -385,7 +385,6 @@ def test_custom_listeners_update(
         global_config_file = f"{TEST_DATA}/virtual-server-custom-listeners/global-configuration.yaml"
         gc_resource = create_gc_from_yaml(kube_apis.custom_objects, global_config_file, "nginx-ingress")
         vs_custom_listeners = f"{TEST_DATA}/virtual-server-custom-listeners/virtual-server.yaml"
-        wait_before_test()
 
         print("\nStep 2: Create VS with custom listener (http-8085, https-8445)")
         patch_virtual_server_from_yaml(
@@ -477,7 +476,7 @@ def test_custom_listeners_update(
             print(gc_event_latest)
             if test_setup["expected_gc_error_msg"]:
                 assert (
-                    gc_event_latest.reason == "WithError"
+                    gc_event_latest.reason == "AddedOrUpdatedWithError"
                     and gc_event_latest.type == "Warning"
                     and test_setup["expected_gc_error_msg"] in gc_event_latest.message
                 )