Merge pull request #31821 from mwielgus/event-name-sync

federation/pkg/federation-controller/ingress/ingress_controller.go

@@ -345,7 +345,7 @@ func (ic *IngressController) reconcileIngress(ingress types.NamespacedName) {
 				for key, val := range baseIngress.ObjectMeta.Annotations {
 					desiredIngress.ObjectMeta.Annotations[key] = val
 				}
-				ic.eventRecorder.Eventf(baseIngress, api.EventTypeNormal, "UpdateCluster",
+				ic.eventRecorder.Eventf(baseIngress, api.EventTypeNormal, "UpdateInCluster",
 					"Updating ingress in cluster %s", cluster.Name)
 
 				operations = append(operations, util.FederatedOperation{
@@ -363,8 +363,8 @@ func (ic *IngressController) reconcileIngress(ingress types.NamespacedName) {
 	}
 	glog.V(4).Infof("Calling federatedUpdater.Update() - operations: %v", operations)
 	err = ic.federatedUpdater.UpdateWithOnError(operations, ic.updateTimeout, func(op util.FederatedOperation, operror error) {
-		ic.eventRecorder.Eventf(baseIngress, api.EventTypeNormal, "FailedClusterUpdate",
-			"Update ingress in cluster %s failed: %v", op.ClusterName, operror)
+		ic.eventRecorder.Eventf(baseIngress, api.EventTypeNormal, "FailedUpdateInCluster",
+			"Ingress update in cluster %s failed: %v", op.ClusterName, operror)
 	})
 	if err != nil {
 		glog.Errorf("Failed to execute updates for %s: %v", ingress, err)

federation/pkg/federation-controller/namespace/namespace_controller.go

@@ -289,7 +289,7 @@ func (nc *NamespaceController) reconcileNamespace(namespace string) {
 			// Update existing namespace, if needed.
 			if !util.ObjectMetaEquivalent(desiredNamespace.ObjectMeta, clusterNamespace.ObjectMeta) ||
 				!reflect.DeepEqual(desiredNamespace.Spec, clusterNamespace.Spec) {
-				nc.eventRecorder.Eventf(baseNamespace, api.EventTypeNormal, "UpdateCluster",
+				nc.eventRecorder.Eventf(baseNamespace, api.EventTypeNormal, "UpdateInCluster",
 					"Updating namespace in cluster %s", cluster.Name)
 
 				operations = append(operations, util.FederatedOperation{
@@ -306,8 +306,8 @@ func (nc *NamespaceController) reconcileNamespace(namespace string) {
 		return
 	}
 	err = nc.federatedUpdater.UpdateWithOnError(operations, nc.updateTimeout, func(op util.FederatedOperation, operror error) {
-		nc.eventRecorder.Eventf(baseNamespace, api.EventTypeNormal, "FailedClusterUpdate",
-			"Update namespace in cluster %s failed: %v", op.ClusterName, operror)
+		nc.eventRecorder.Eventf(baseNamespace, api.EventTypeNormal, "UpdateInClusterFailed",
+			"Namespace update in cluster %s failed: %v", op.ClusterName, operror)
 	})
 	if err != nil {
 		glog.Errorf("Failed to execute updates for %s: %v", namespace, err)

federation/pkg/federation-controller/secret/secret_controller.go

@@ -321,8 +321,8 @@ func (secretcontroller *SecretController) reconcileSecret(namespace string, secr
 	}
 	err = secretcontroller.federatedUpdater.UpdateWithOnError(operations, secretcontroller.updateTimeout,
 		func(op util.FederatedOperation, operror error) {
-			secretcontroller.eventRecorder.Eventf(baseSecret, api.EventTypeNormal, "FailedUpdateInCluster",
-				"Update secret in cluster %s failed: %v", op.ClusterName, operror)
+			secretcontroller.eventRecorder.Eventf(baseSecret, api.EventTypeNormal, "UpdateInClusterFailed",
+				"Secret update in cluster %s failed: %v", op.ClusterName, operror)
 		})
 
 	if err != nil {