Merge pull request #508 from l1b0k/fix/eip

eip: override pod annotation
AliyunContainerService · Jul 19, 2023 · 16d7b26 · 16d7b26
2 parents fa2c083 + c059bf9
commit 16d7b26
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/daemon/k8s.go b/daemon/k8s.go
@@ -164,13 +164,8 @@ func (k *k8s) PatchEipInfo(info *types.PodInfo) error {
 		return err
 	}
 
-	if pod.GetAnnotations() != nil {
-		if eip, ok := pod.GetAnnotations()[podEipAddress]; ok {
-			if eip == info.EipInfo.PodEipIP {
-				return nil
-			}
-			return errors.Errorf("Pod already have eip annotation: %v", eip)
-		}
+	if pod.Annotations == nil {
+		pod.Annotations = map[string]string{}
 	}
 	pod.Annotations[podEipAddress] = info.EipInfo.PodEipIP