Merge pull request #15185 from yujuhong/fix_annotation

kubelet: fix mirror pod creation/deletion
pull/6/head
Robert Bailey 2015-10-08 14:07:45 -07:00
commit f828c9a49c
1 changed files with 9 additions and 2 deletions

View File

@ -47,9 +47,16 @@ func (mc *basicMirrorClient) CreateMirrorPod(pod *api.Pod) error {
if mc.apiserverClient == nil {
return nil
}
pod.Annotations[ConfigMirrorAnnotationKey] = MirrorType
// Make a copy of the pod.
copyPod := *pod
copyPod.Annotations = make(map[string]string)
_, err := mc.apiserverClient.Pods(pod.Namespace).Create(pod)
for k, v := range pod.Annotations {
copyPod.Annotations[k] = v
}
copyPod.Annotations[ConfigMirrorAnnotationKey] = MirrorType
_, err := mc.apiserverClient.Pods(copyPod.Namespace).Create(&copyPod)
return err
}