Commit f828c9a4 authored by Robert Bailey's avatar Robert Bailey

Merge pull request #15185 from yujuhong/fix_annotation

kubelet: fix mirror pod creation/deletion
parents f9fc6cc4 53e65b08
...@@ -47,9 +47,16 @@ func (mc *basicMirrorClient) CreateMirrorPod(pod *api.Pod) error { ...@@ -47,9 +47,16 @@ func (mc *basicMirrorClient) CreateMirrorPod(pod *api.Pod) error {
if mc.apiserverClient == nil { if mc.apiserverClient == nil {
return 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 return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment