github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Use EventTypeWarning instead of EventTypeNormal

Browse Source
This commit is contained in:
zhangxiaoyu-zidif 2017-04-17 20:23:45 +08:00
parent 39713aca4e
commit 58d835aef5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
federation/pkg/federation-controller/daemonset/daemonset_controller.go
View File

@ -446,7 +446,7 @@ func (daemonsetcontroller *DaemonSetController) reconcileDaemonSet(namespace str
} }
err = daemonsetcontroller.federatedUpdater.UpdateWithOnError(operations, daemonsetcontroller.updateTimeout, err = daemonsetcontroller.federatedUpdater.UpdateWithOnError(operations, daemonsetcontroller.updateTimeout,
func(op util.FederatedOperation, operror error) { func(op util.FederatedOperation, operror error) {
daemonsetcontroller.eventRecorder.Eventf(baseDaemonSet, api.EventTypeNormal, "UpdateInClusterFailed", daemonsetcontroller.eventRecorder.Eventf(baseDaemonSet, api.EventTypeWarning, "UpdateInClusterFailed",
"DaemonSet update in cluster %s failed: %v", op.ClusterName, operror) "DaemonSet update in cluster %s failed: %v", op.ClusterName, operror)
}) })

2
federation/pkg/federation-controller/deployment/deploymentcontroller.go
View File

@ -615,7 +615,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation
return statusAllOk, nil return statusAllOk, nil
} }
err = fdc.fedUpdater.UpdateWithOnError(operations, updateTimeout, func(op fedutil.FederatedOperation, operror error) { err = fdc.fedUpdater.UpdateWithOnError(operations, updateTimeout, func(op fedutil.FederatedOperation, operror error) {
fdc.eventRecorder.Eventf(fd, api.EventTypeNormal, "FailedUpdateInCluster", fdc.eventRecorder.Eventf(fd, api.EventTypeWarning, "FailedUpdateInCluster",
"Deployment update in cluster %s failed: %v", op.ClusterName, operror) "Deployment update in cluster %s failed: %v", op.ClusterName, operror)
}) })
if err != nil { if err != nil {

2
federation/pkg/federation-controller/ingress/ingress_controller.go
View File

@ -930,7 +930,7 @@ func (ic *IngressController) reconcileIngress(ingress types.NamespacedName) {
} }
glog.V(4).Infof("Calling federatedUpdater.Update() - operations: %v", operations) glog.V(4).Infof("Calling federatedUpdater.Update() - operations: %v", operations)
err = ic.federatedIngressUpdater.UpdateWithOnError(operations, ic.updateTimeout, func(op util.FederatedOperation, operror error) { err = ic.federatedIngressUpdater.UpdateWithOnError(operations, ic.updateTimeout, func(op util.FederatedOperation, operror error) {
ic.eventRecorder.Eventf(baseIngress, api.EventTypeNormal, "FailedClusterUpdate", ic.eventRecorder.Eventf(baseIngress, api.EventTypeWarning, "FailedClusterUpdate",
"Ingress update in cluster %s failed: %v", op.ClusterName, operror) "Ingress update in cluster %s failed: %v", op.ClusterName, operror)
}) })
if err != nil { if err != nil {