check if ipv4Addr or ipv6Addr is empty before calling AnnotatePod() (#…

…2702) Co-authored-by: Zach Dorame-Barajas <doramebz@amazon.com>
aws · Dec 14, 2023 · 3c97b82 · 3c97b82
1 parent a9ef991
commit 3c97b82
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/pkg/ipamd/rpc_handler.go b/pkg/ipamd/rpc_handler.go
@@ -203,9 +203,16 @@ func (s *server) AddNetwork(ctx context.Context, in *rpc.AddNetworkRequest) (*rp
 
 	if s.ipamContext.enablePodIPAnnotation {
 		// On ADD, we pass empty string as there is no IP being released
-		err = s.ipamContext.AnnotatePod(in.K8S_POD_NAME, in.K8S_POD_NAMESPACE, vpccniPodIPKey, ipv4Addr, "")
-		if err != nil {
-			log.Errorf("Failed to add the pod annotation: %v", err)
+		if ipv4Addr != "" {
+			err = s.ipamContext.AnnotatePod(in.K8S_POD_NAME, in.K8S_POD_NAMESPACE, vpccniPodIPKey, ipv4Addr, "")
+			if err != nil {
+				log.Errorf("Failed to add the pod annotation: %v", err)
+			}
+		} else if ipv6Addr != "" {
+			err = s.ipamContext.AnnotatePod(in.K8S_POD_NAME, in.K8S_POD_NAMESPACE, vpccniPodIPKey, ipv6Addr, "")
+			if err != nil {
+				log.Errorf("Failed to add the pod annotation: %v", err)
+			}
 		}
 	}
 	resp := rpc.AddNetworkReply{