diff --git a/federation/pkg/federation-controller/daemonset/daemonset_controller.go b/federation/pkg/federation-controller/daemonset/daemonset_controller.go index 5d2bb7e1ba9..e27b5da18ab 100644 --- a/federation/pkg/federation-controller/daemonset/daemonset_controller.go +++ b/federation/pkg/federation-controller/daemonset/daemonset_controller.go @@ -366,7 +366,7 @@ func (daemonsetcontroller *DaemonSetController) reconcileDaemonSet(namespace str if baseDaemonSet.DeletionTimestamp != nil { if err := daemonsetcontroller.delete(baseDaemonSet); err != nil { glog.Errorf("Failed to delete %s: %v", daemonsetName, err) - daemonsetcontroller.eventRecorder.Eventf(baseDaemonSet, api.EventTypeNormal, "DeleteFailed", + daemonsetcontroller.eventRecorder.Eventf(baseDaemonSet, api.EventTypeWarning, "DeleteFailed", "DaemonSet delete failed: %v", err) daemonsetcontroller.deliverDaemonSet(namespace, daemonsetName, 0, true) } @@ -446,7 +446,7 @@ func (daemonsetcontroller *DaemonSetController) reconcileDaemonSet(namespace str } err = daemonsetcontroller.federatedUpdater.UpdateWithOnError(operations, daemonsetcontroller.updateTimeout, 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) }) diff --git a/federation/pkg/federation-controller/deployment/deploymentcontroller.go b/federation/pkg/federation-controller/deployment/deploymentcontroller.go index b3683c64578..9c727a716e5 100644 --- a/federation/pkg/federation-controller/deployment/deploymentcontroller.go +++ b/federation/pkg/federation-controller/deployment/deploymentcontroller.go @@ -500,7 +500,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation if fd.DeletionTimestamp != nil { if err := fdc.delete(fd); err != nil { glog.Errorf("Failed to delete %s: %v", fd.Name, err) - fdc.eventRecorder.Eventf(fd, api.EventTypeNormal, "DeleteFailed", + fdc.eventRecorder.Eventf(fd, api.EventTypeWarning, "DeleteFailed", "Deployment delete failed: %v", err) return statusError, err } @@ -615,7 +615,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation return statusAllOk, nil } 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) }) if err != nil { diff --git a/federation/pkg/federation-controller/ingress/ingress_controller.go b/federation/pkg/federation-controller/ingress/ingress_controller.go index d22a01858e6..cadc5676152 100644 --- a/federation/pkg/federation-controller/ingress/ingress_controller.go +++ b/federation/pkg/federation-controller/ingress/ingress_controller.go @@ -746,7 +746,7 @@ func (ic *IngressController) reconcileIngress(ingress types.NamespacedName) { if baseIngress.DeletionTimestamp != nil { if err := ic.delete(baseIngress); err != nil { glog.Errorf("Failed to delete %s: %v", ingress, err) - ic.eventRecorder.Eventf(baseIngress, api.EventTypeNormal, "DeleteFailed", + ic.eventRecorder.Eventf(baseIngress, api.EventTypeWarning, "DeleteFailed", "Ingress delete failed: %v", err) ic.deliverIngress(ingress, 0, true) } @@ -930,7 +930,7 @@ func (ic *IngressController) reconcileIngress(ingress types.NamespacedName) { } glog.V(4).Infof("Calling federatedUpdater.Update() - operations: %v", operations) 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) }) if err != nil { diff --git a/federation/pkg/federation-controller/namespace/namespace_controller.go b/federation/pkg/federation-controller/namespace/namespace_controller.go index 300e4779f37..9f12414966c 100644 --- a/federation/pkg/federation-controller/namespace/namespace_controller.go +++ b/federation/pkg/federation-controller/namespace/namespace_controller.go @@ -365,7 +365,7 @@ func (nc *NamespaceController) reconcileNamespace(namespace string) { if baseNamespace.DeletionTimestamp != nil { if err := nc.delete(baseNamespace); err != nil { glog.Errorf("Failed to delete %s: %v", namespace, err) - nc.eventRecorder.Eventf(baseNamespace, api.EventTypeNormal, "DeleteFailed", + nc.eventRecorder.Eventf(baseNamespace, api.EventTypeWarning, "DeleteFailed", "Namespace delete failed: %v", err) nc.deliverNamespace(namespace, 0, true) } @@ -444,7 +444,7 @@ func (nc *NamespaceController) reconcileNamespace(namespace string) { glog.V(2).Infof("Updating namespace %s in underlying clusters. Operations: %d", baseNamespace.Name, len(operations)) err = nc.federatedUpdater.UpdateWithOnError(operations, nc.updateTimeout, func(op util.FederatedOperation, operror error) { - nc.eventRecorder.Eventf(baseNamespace, api.EventTypeNormal, "UpdateInClusterFailed", + nc.eventRecorder.Eventf(baseNamespace, api.EventTypeWarning, "UpdateInClusterFailed", "Namespace update in cluster %s failed: %v", op.ClusterName, operror) }) if err != nil { diff --git a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go index 10f65e677c0..a664d08a959 100644 --- a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go +++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go @@ -512,7 +512,7 @@ func (frsc *ReplicaSetController) reconcileReplicaSet(key string) (reconciliatio if frs.DeletionTimestamp != nil { if err := frsc.delete(frs); err != nil { glog.Errorf("Failed to delete %s: %v", frs, err) - frsc.eventRecorder.Eventf(frs, api.EventTypeNormal, "DeleteFailed", + frsc.eventRecorder.Eventf(frs, api.EventTypeWarning, "DeleteFailed", "ReplicaSet delete failed: %v", err) frsc.deliverReplicaSetByKey(key, 0, true) return statusError, err @@ -627,7 +627,7 @@ func (frsc *ReplicaSetController) reconcileReplicaSet(key string) (reconciliatio return statusAllOk, nil } err = frsc.fedUpdater.UpdateWithOnError(operations, updateTimeout, func(op fedutil.FederatedOperation, operror error) { - frsc.eventRecorder.Eventf(frs, api.EventTypeNormal, "FailedUpdateInCluster", + frsc.eventRecorder.Eventf(frs, api.EventTypeWarning, "FailedUpdateInCluster", "Replicaset update in cluster %s failed: %v", op.ClusterName, operror) }) if err != nil { diff --git a/federation/pkg/federation-controller/service/servicecontroller.go b/federation/pkg/federation-controller/service/servicecontroller.go index 78132ee05b0..52de2bf6104 100644 --- a/federation/pkg/federation-controller/service/servicecontroller.go +++ b/federation/pkg/federation-controller/service/servicecontroller.go @@ -45,7 +45,7 @@ import ( fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/pkg/api" - v1 "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/api/v1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/controller" @@ -1008,7 +1008,7 @@ func (s *ServiceController) processServiceUpdate(cachedService *cachedService, s if service.DeletionTimestamp != nil { if err := s.delete(service); err != nil { glog.Errorf("Failed to delete %s: %v", service, err) - s.eventRecorder.Eventf(service, api.EventTypeNormal, "DeleteFailed", + s.eventRecorder.Eventf(service, api.EventTypeWarning, "DeleteFailed", "Service delete failed: %v", err) return err, cachedService.nextRetryDelay() }