kubelet: fix mirror pod creation/deletion

When annotating the mirror pod, make a new copy of the annotations map from the static pod, so that the change wouldn't be in the static pod.

kubelet: fix mirror pod creation/deletion
53e65b08 · Yu-Ju Hong · 7ba48583 · 53e65b08
Commit 53e65b08 authored Oct 06, 2015 by Yu-Ju Hong
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

mirror_client.go pkg/kubelet/mirror_client.go +9 -2

No files found.
--- a/pkg/kubelet/mirror_client.go
+++ b/pkg/kubelet/mirror_client.go
@@ -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
 }