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

Merge pull request #22560 from janetkuo/pod-update-delete-log

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-04 23:32:35 -08:00
parent 0f335df106 59b1f5b8b5
commit 20838c3314
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/deployment/deployment_controller.go
View File

@@ -310,7 +310,7 @@ func (dc *DeploymentController) addPod(obj interface{}) {
if !ok {
return
}
glog.V(4).Infof("Pod %s created.", pod.Name)
glog.V(4).Infof("Pod %s created: %+v.", pod.Name, pod)
if d := dc.getDeploymentForPod(pod); d != nil {
dc.enqueueDeployment(d)
}
@@ -324,11 +324,11 @@ func (dc *DeploymentController) updatePod(old, cur interface{}) {
return
}
curPod := cur.(*api.Pod)
glog.V(4).Infof("Pod %s updated.", curPod.Name)
oldPod := old.(*api.Pod)
glog.V(4).Infof("Pod %s updated %+v -> %+v.", curPod.Name, oldPod, curPod)
if d := dc.getDeploymentForPod(curPod); d != nil {
dc.enqueueDeployment(d)
}
oldPod := old.(*api.Pod)
if !api.Semantic.DeepEqual(oldPod, curPod) {
if oldD := dc.getDeploymentForPod(oldPod); oldD != nil {
dc.enqueueDeployment(oldD)
@@ -357,7 +357,7 @@ func (dc *DeploymentController) deletePod(obj interface{}) {
return
}
}
glog.V(4).Infof("Pod %s deleted.", pod.Name)
glog.V(4).Infof("Pod %s deleted: %+v.", pod.Name, pod)
if d := dc.getDeploymentForPod(pod); d != nil {
dc.enqueueDeployment(d)
}

5
pkg/controller/replicaset/replica_set.go
View File

@@ -289,6 +289,7 @@ func isReplicaSetMatch(pod *api.Pod, rs *extensions.ReplicaSet) bool {
// When a pod is created, enqueue the replica set that manages it and update it's expectations.
func (rsc *ReplicaSetController) addPod(obj interface{}) {
pod := obj.(*api.Pod)
glog.V(4).Infof("Pod %s created: %+v.", pod.Name, pod)
rs := rsc.getPodReplicaSet(pod)
if rs == nil {
@@ -319,6 +320,8 @@ func (rsc *ReplicaSetController) updatePod(old, cur interface{}) {
return
}
curPod := cur.(*api.Pod)
oldPod := old.(*api.Pod)
glog.V(4).Infof("Pod %s updated %+v -> %+v.", curPod.Name, oldPod, curPod)
rs := rsc.getPodReplicaSet(curPod)
if rs == nil {
return
@@ -328,7 +331,6 @@ func (rsc *ReplicaSetController) updatePod(old, cur interface{}) {
glog.Errorf("Couldn't get key for replication controller %#v: %v", rs, err)
return
}
oldPod := old.(*api.Pod)
if curPod.DeletionTimestamp != nil && oldPod.DeletionTimestamp == nil {
// when a pod is deleted gracefully it's deletion timestamp is first modified to reflect a grace period,
@@ -373,6 +375,7 @@ func (rsc *ReplicaSetController) deletePod(obj interface{}) {
return
}
}
glog.V(4).Infof("Pod %s deleted: %+v.", pod.Name, pod)
if rs := rsc.getPodReplicaSet(pod); rs != nil {
rsKey, err := controller.KeyFunc(rs)
if err != nil {