github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Automatic merge from submit-queue

Use EventTypeWarning instead of EventTypeNormal when failure
This commit is contained in:
Kubernetes Submit Queue 2017-04-13 01:39:02 -07:00 committed by GitHub
commit 5c94d42236
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
federation/pkg/federation-controller/configmap/configmap_controller.go
View File

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

4
federation/pkg/federation-controller/secret/secret_controller.go
View File

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

2
federation/pkg/federation-controller/util/deletionhelper/deletion_helper.go
View File

@ -152,7 +152,7 @@ func (dh *DeletionHelper) HandleObjectInUnderlyingClusters(obj runtime.Object) (
} }
err = dh.updater.UpdateWithOnError(operations, dh.updateTimeout, func(op util.FederatedOperation, operror error) { err = dh.updater.UpdateWithOnError(operations, dh.updateTimeout, func(op util.FederatedOperation, operror error) {
objName := dh.objNameFunc(op.Obj) 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) "Failed to delete obj %s in cluster %s: %v", objName, op.ClusterName, operror)
}) })
if err != nil { if err != nil {