From 0845bd389a6ce0b7abfffec1fc39de7f8e47c88d Mon Sep 17 00:00:00 2001 From: FengyunPan Date: Wed, 12 Apr 2017 11:53:54 +0800 Subject: [PATCH] Use EventTypeWarning instead of EventTypeNormal when failure --- .../federation-controller/configmap/configmap_controller.go | 4 ++-- .../pkg/federation-controller/secret/secret_controller.go | 4 ++-- .../util/deletionhelper/deletion_helper.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/federation/pkg/federation-controller/configmap/configmap_controller.go b/federation/pkg/federation-controller/configmap/configmap_controller.go index 3c9182bea6a..a7281af6809 100644 --- a/federation/pkg/federation-controller/configmap/configmap_controller.go +++ b/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) }) diff --git a/federation/pkg/federation-controller/secret/secret_controller.go b/federation/pkg/federation-controller/secret/secret_controller.go index 128bcb3649f..7f7dce885c1 100644 --- a/federation/pkg/federation-controller/secret/secret_controller.go +++ b/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) }) diff --git a/federation/pkg/federation-controller/util/deletionhelper/deletion_helper.go b/federation/pkg/federation-controller/util/deletionhelper/deletion_helper.go index 62cdba8574e..440f540f1a6 100644 --- a/federation/pkg/federation-controller/util/deletionhelper/deletion_helper.go +++ b/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 {