scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 12:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed reasons of some events.

Browse Source 
Fixed reasons of some events: made consistent with API conventions (CamelCase).
This commit is contained in:
Jerzy Szczepkowski
2015-09-14 16:38:09 +02:00
parent d007c9141d
commit 04919ebfa9
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/controller_utils.go
View File

@@ -318,11 +318,11 @@ func (r RealPodControl) CreateReplicaOnNode(namespace string, ds *experimental.D
} }
pod.Spec.NodeName = nodeName pod.Spec.NodeName = nodeName
if newPod, err := r.KubeClient.Pods(namespace).Create(pod); err != nil { if newPod, err := r.KubeClient.Pods(namespace).Create(pod); err != nil {
r.Recorder.Eventf(ds, "failedCreate", "Error creating: %v", err) r.Recorder.Eventf(ds, "FailedCreate", "Error creating: %v", err)
return fmt.Errorf("unable to create pod replica: %v", err) return fmt.Errorf("unable to create pod replica: %v", err)
} else { } else {
glog.V(4).Infof("Controller %v created pod %v", ds.Name, newPod.Name) glog.V(4).Infof("Controller %v created pod %v", ds.Name, newPod.Name)
r.Recorder.Eventf(ds, "successfulCreate", "Created pod: %v", newPod.Name) r.Recorder.Eventf(ds, "SuccessfulCreate", "Created pod: %v", newPod.Name)
} }
return nil return nil

21
pkg/controller/service/servicecontroller.go
View File

@@ -238,7 +238,7 @@ func (s *ServiceController) processDelta(delta *cache.Delta) (error, bool) {
case cache.Sync: case cache.Sync:
err, retry := s.createLoadBalancerIfNeeded(namespacedName, service, cachedService.appliedState) err, retry := s.createLoadBalancerIfNeeded(namespacedName, service, cachedService.appliedState)
if err != nil { if err != nil {
message := "error creating load balancer" message := "Error creating load balancer"
if retry { if retry {
message += " (will retry): " message += " (will retry): "
} else { } else {
@@ -255,14 +255,14 @@ func (s *ServiceController) processDelta(delta *cache.Delta) (error, bool) {
cachedService.appliedState = service cachedService.appliedState = service
s.cache.set(namespacedName.String(), cachedService) s.cache.set(namespacedName.String(), cachedService)
case cache.Deleted: case cache.Deleted:
s.eventRecorder.Event(service, "DeletingLoadBalancer", "deleting loadbalancer") s.eventRecorder.Event(service, "DeletingLoadBalancer", "Deleting load balancer")
err := s.balancer.EnsureTCPLoadBalancerDeleted(s.loadBalancerName(service), s.zone.Region) err := s.balancer.EnsureTCPLoadBalancerDeleted(s.loadBalancerName(service), s.zone.Region)
if err != nil { if err != nil {
message := "error deleting load balancer (will retry): " + err.Error() message := "Error deleting load balancer (will retry): " + err.Error()
s.eventRecorder.Event(service, "DeletingLoadBalancerFailed", message) s.eventRecorder.Event(service, "DeletingLoadBalancerFailed", message)
return err, retryable return err, retryable
} }
s.eventRecorder.Event(service, "DeletedLoadBalancer", "deleted loadbalancer") s.eventRecorder.Event(service, "DeletedLoadBalancer", "Deleted load balancer")
s.cache.delete(namespacedName.String()) s.cache.delete(namespacedName.String())
default: default:
glog.Errorf("Unexpected delta type: %v", delta.Type) glog.Errorf("Unexpected delta type: %v", delta.Type)
@@ -305,11 +305,11 @@ func (s *ServiceController) createLoadBalancerIfNeeded(namespacedName types.Name
if needDelete { if needDelete {
glog.Infof("Deleting existing load balancer for service %s that no longer needs a load balancer.", namespacedName) glog.Infof("Deleting existing load balancer for service %s that no longer needs a load balancer.", namespacedName)
s.eventRecorder.Event(service, "DeletingLoadBalancer", "deleting loadbalancer") s.eventRecorder.Event(service, "DeletingLoadBalancer", "Deleting load balancer")
if err := s.balancer.EnsureTCPLoadBalancerDeleted(s.loadBalancerName(service), s.zone.Region); err != nil { if err := s.balancer.EnsureTCPLoadBalancerDeleted(s.loadBalancerName(service), s.zone.Region); err != nil {
return err, retryable return err, retryable
} }
s.eventRecorder.Event(service, "DeletedLoadBalancer", "deleted loadbalancer") s.eventRecorder.Event(service, "DeletedLoadBalancer", "Deleted load balancer")
} }
service.Status.LoadBalancer = api.LoadBalancerStatus{} service.Status.LoadBalancer = api.LoadBalancerStatus{}
@@ -319,12 +319,12 @@ func (s *ServiceController) createLoadBalancerIfNeeded(namespacedName types.Name
// TODO: We could do a dry-run here if wanted to avoid the spurious cloud-calls & events when we restart // TODO: We could do a dry-run here if wanted to avoid the spurious cloud-calls & events when we restart
// The load balancer doesn't exist yet, so create it. // The load balancer doesn't exist yet, so create it.
s.eventRecorder.Event(service, "CreatingLoadBalancer", "creating loadbalancer") s.eventRecorder.Event(service, "CreatingLoadBalancer", "Creating load balancer")
err := s.createExternalLoadBalancer(service) err := s.createExternalLoadBalancer(service)
if err != nil { if err != nil {
return fmt.Errorf("failed to create external load balancer for service %s: %v", namespacedName, err), retryable return fmt.Errorf("failed to create external load balancer for service %s: %v", namespacedName, err), retryable
} }
s.eventRecorder.Event(service, "CreatedLoadBalancer", "created loadbalancer") s.eventRecorder.Event(service, "CreatedLoadBalancer", "Created load balancer")
} }
// Write the state if changed // Write the state if changed
@@ -659,7 +659,7 @@ func (s *ServiceController) lockedUpdateLoadBalancerHosts(service *api.Service,
name := cloudprovider.GetLoadBalancerName(service) name := cloudprovider.GetLoadBalancerName(service)
err := s.balancer.UpdateTCPLoadBalancer(name, s.zone.Region, hosts) err := s.balancer.UpdateTCPLoadBalancer(name, s.zone.Region, hosts)
if err == nil { if err == nil {
s.eventRecorder.Event(service, "UpdatedLoadBalancer", "updated loadbalancer with new hosts") s.eventRecorder.Event(service, "UpdatedLoadBalancer", "Updated load balancer with new hosts")
return nil return nil
} }
@@ -670,8 +670,7 @@ func (s *ServiceController) lockedUpdateLoadBalancerHosts(service *api.Service,
return nil return nil
} }
message := "error updating loadbalancer with new hosts: " + err.Error() s.eventRecorder.Eventf(service, "LoadBalancerUpdateFailed", "Error updating load balancer with new hosts: %v", err)
s.eventRecorder.Event(service, "LoadBalancerUpdateFailed", message)
return err return err
} }