Skip to content

K
k3s
Commit 7f2011c1 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45225 from FengyunPan/update-event-type

Automatic merge from submit-queue (batch tested with PRs 40544, 44338, 45225) [Federation]Update event type Use EventTypeWarning instead of EventTypeNormal when get failure Left behind after pr #40296
parents 932dabda eb8f5d35
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
federation/pkg/federation-controller/service/servicecontroller.go
View file @ 7f2011c1
......@@ -537,7 +537,7 @@ func (s *ServiceController) reconcileService(key string) reconciliationStatus {
if fedService.DeletionTimestamp != nil {
if err := s.delete(fedService); err != nil {
runtime.HandleError(fmt.Errorf("Failed to delete %s: %v", key, err))
s.eventRecorder.Eventf(fedService, api.EventTypeNormal, "DeleteFailed", "Deleting service failed: %v", err)
s.eventRecorder.Eventf(fedService, api.EventTypeWarning, "DeleteFailed", "Deleting service failed: %v", err)
return statusRecoverableError
}
glog.V(3).Infof("Deleting federated service succeeded: %s", key)
......@@ -604,7 +604,7 @@ func (s *ServiceController) reconcileService(key string) reconciliationStatus {
err = s.federatedUpdater.UpdateWithOnError(operations, s.updateTimeout,
func(op fedutil.FederatedOperation, operror error) {
runtime.HandleError(fmt.Errorf("Service update in cluster %s failed: %v", op.ClusterName, operror))
s.eventRecorder.Eventf(fedService, api.EventTypeNormal, "UpdateInClusterFailed", "Service update in cluster %s failed: %v", op.ClusterName, operror)
s.eventRecorder.Eventf(fedService, api.EventTypeWarning, "UpdateInClusterFailed", "Service update in cluster %s failed: %v", op.ClusterName, operror)
})
if err != nil {
if !errors.IsAlreadyExists(err) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment