prevent pointer to tmp-object bug

pull/3479/head
Timofey Kirillov 8 years ago
parent 910b80fd1e
commit f9ff43ad5b

@ -121,9 +121,9 @@ func (pod *PodWatchMonitor) RefreshManifest() error {
} }
func (pod *PodWatchMonitor) GetReadyCondition() (res *core.PodCondition) { func (pod *PodWatchMonitor) GetReadyCondition() (res *core.PodCondition) {
for _, podCondition := range pod.Manifest.Status.Conditions { for i, _ := range pod.Manifest.Status.Conditions {
if podCondition.Type == "Ready" { if pod.Manifest.Status.Conditions[i].Type == "Ready" {
res = &podCondition res = &pod.Manifest.Status.Conditions[i]
break break
} }
} }
@ -131,9 +131,9 @@ func (pod *PodWatchMonitor) GetReadyCondition() (res *core.PodCondition) {
} }
func (pod *PodWatchMonitor) GetInitContainerStatus(containerName string) (res *core.ContainerStatus) { func (pod *PodWatchMonitor) GetInitContainerStatus(containerName string) (res *core.ContainerStatus) {
for _, containerStatus := range pod.Manifest.Status.ContainerStatuses { for i, _ := range pod.Manifest.Status.InitContainerStatuses {
if containerStatus.Name == containerName { if pod.Manifest.Status.InitContainerStatuses[i].Name == containerName {
res = &containerStatus res = &pod.Manifest.Status.InitContainerStatuses[i]
break break
} }
} }
@ -141,9 +141,9 @@ func (pod *PodWatchMonitor) GetInitContainerStatus(containerName string) (res *c
} }
func (pod *PodWatchMonitor) GetContainerStatus(containerName string) (res *core.ContainerStatus) { func (pod *PodWatchMonitor) GetContainerStatus(containerName string) (res *core.ContainerStatus) {
for _, containerStatus := range pod.Manifest.Status.ContainerStatuses { for i, _ := range pod.Manifest.Status.ContainerStatuses {
if containerStatus.Name == containerName { if pod.Manifest.Status.ContainerStatuses[i].Name == containerName {
res = &containerStatus res = &pod.Manifest.Status.ContainerStatuses[i]
break break
} }
} }

Loading…
Cancel
Save