Merge pull request #32 from SchSeba/fix_vmi_object

Fix pod annotation clear

pkg/pool-manager/pod_pool.go

@@ -85,9 +85,9 @@ func (p *PoolManager) AllocatePodMac(pod *corev1.Pod) error {
 			}
 
 			network.MacRequest = macAddr
-			networkList = append(networkList, network)
 			allocations = append(allocations, macAddr)
 		}
+		networkList = append(networkList, network)
 	}
 
 	networkListJson, err := json.Marshal(networkList)

pkg/pool-manager/pool_test.go

@@ -259,6 +259,21 @@ var _ = Describe("Pool", func() {
 			_, exist = poolManager.macPoolMap["02:00:00:00:00:01"]
 			Expect(exist).To(BeFalse())
 		})
+		It("should allocate requested mac when empty", func() {
+			fakeClient := fake.NewSimpleClientset()
+			startPoolRangeEnv, err := net.ParseMAC("02:00:00:00:00:00")
+			Expect(err).ToNot(HaveOccurred())
+			endPoolRangeEnv, err := net.ParseMAC("02:00:00:00:00:02")
+			Expect(err).ToNot(HaveOccurred())
+			poolManager, err := NewPoolManager(fakeClient, startPoolRangeEnv, endPoolRangeEnv, false)
+			Expect(err).ToNot(HaveOccurred())
+			newPod := samplePod
+			newPod.Name = "newPod"
+
+			err = poolManager.AllocatePodMac(&newPod)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(newPod.Annotations[networksAnnotation]).To(Equal(afterAllocationAnnotation[networksAnnotation]))
+		})
 	})
 
 })

pkg/webhook/pod/pod.go

@@ -83,7 +83,7 @@ func (a *podAnnotator) Handle(ctx context.Context, req types.Request) types.Resp
 		copyPod.Namespace = req.AdmissionRequest.Namespace
 	}
 
-	log.V(1).Info("got a create pod event", "podName", pod.Name, "podNamespace", pod.Namespace)
+	log.V(1).Info("got a create pod event", "podName", copyPod.Name, "podNamespace", copyPod.Namespace)
 	err = a.poolManager.AllocatePodMac(copyPod)
 	if err != nil {
 		return admission.ErrorResponse(http.StatusInternalServerError, err)