Merge pull request #44378 from FengyunPan/update-federation-event

federation/pkg/federation-controller/configmap/configmap_controller.go

@@ -335,7 +335,7 @@ func (configmapcontroller *ConfigMapController) reconcileConfigMap(configmap typ
 	if configMap.DeletionTimestamp != nil {
 		if err := configmapcontroller.delete(configMap); err != nil {
 			glog.Errorf("Failed to delete %s: %v", configmap, err)
-			configmapcontroller.eventRecorder.Eventf(configMap, api.EventTypeNormal, "DeleteFailed",
+			configmapcontroller.eventRecorder.Eventf(configMap, api.EventTypeWarning, "DeleteFailed",
 				"ConfigMap delete failed: %v", err)
 			configmapcontroller.deliverConfigMap(configmap, 0, true)
 		}
@@ -410,7 +410,7 @@ func (configmapcontroller *ConfigMapController) reconcileConfigMap(configmap typ
 	}
 	err = configmapcontroller.federatedUpdater.UpdateWithOnError(operations, configmapcontroller.updateTimeout,
 		func(op util.FederatedOperation, operror error) {
-			configmapcontroller.eventRecorder.Eventf(configMap, api.EventTypeNormal, "UpdateInClusterFailed",
+			configmapcontroller.eventRecorder.Eventf(configMap, api.EventTypeWarning, "UpdateInClusterFailed",
 				"ConfigMap update in cluster %s failed: %v", op.ClusterName, operror)
 		})
 

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

@@ -372,7 +372,7 @@ func (s *FederationSyncController) reconcile(namespacedName types.NamespacedName
 	if meta.DeletionTimestamp != nil {
 		if err := s.delete(obj, namespacedName); err != nil {
 			glog.Errorf("Failed to delete %s %s: %v", kind, namespacedName, err)
-			s.eventRecorder.Eventf(obj, api.EventTypeNormal, "DeleteFailed",
+			s.eventRecorder.Eventf(obj, api.EventTypeWarning, "DeleteFailed",
 				"%s delete failed: %v", strings.ToTitle(kind), err)
 			s.deliver(namespacedName, 0, true)
 		}
@@ -442,7 +442,7 @@ func (s *FederationSyncController) reconcile(namespacedName types.NamespacedName
 	}
 	err = s.updater.UpdateWithOnError(operations, s.updateTimeout,
 		func(op util.FederatedOperation, operror error) {
-			s.eventRecorder.Eventf(obj, api.EventTypeNormal, "UpdateInClusterFailed",
+			s.eventRecorder.Eventf(obj, api.EventTypeWarning, "UpdateInClusterFailed",
 				"%s update in cluster %s failed: %v", strings.ToTitle(kind), op.ClusterName, operror)
 		})
 

federation/pkg/federation-controller/util/deletionhelper/deletion_helper.go

@@ -152,7 +152,7 @@ func (dh *DeletionHelper) HandleObjectInUnderlyingClusters(obj runtime.Object) (
 	}
 	err = dh.updater.UpdateWithOnError(operations, dh.updateTimeout, func(op util.FederatedOperation, operror error) {
 		objName := dh.objNameFunc(op.Obj)
-		dh.eventRecorder.Eventf(obj, api.EventTypeNormal, "DeleteInClusterFailed",
+		dh.eventRecorder.Eventf(obj, api.EventTypeWarning, "DeleteInClusterFailed",
 			"Failed to delete obj %s in cluster %s: %v", objName, op.ClusterName, operror)
 	})
 	if err != nil {