do not patch CNINode for custom networking unless podENI is enabled (#…

…2591)
aws · Sep 29, 2023 · 78df61b · 78df61b
1 parent b5d501d
commit 78df61b
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/pkg/ipamd/ipamd.go b/pkg/ipamd/ipamd.go
@@ -560,14 +560,16 @@ func (c *IPAMContext) nodeInit() error {
 
 		eniConfigName, err := eniconfig.GetNodeSpecificENIConfigName(node)
 		if err == nil && eniConfigName != "default" {
-			// Add the feature name to CNINode of this node
-			err := c.AddFeatureToCNINode(ctx, rcv1alpha1.CustomNetworking, eniConfigName)
-			if err != nil {
-				log.Errorf("Failed to add feature custom networking into CNINode", err)
-				podENIErrInc("nodeInit")
-				return err
+			// If Security Groups for Pods is enabled, the VPC Resource Controller must also know that Custom Networking is enabled
+			if c.enablePodENI {
+				err := c.AddFeatureToCNINode(ctx, rcv1alpha1.CustomNetworking, eniConfigName)
+				if err != nil {
+					log.Errorf("Failed to add feature custom networking into CNINode", err)
+					podENIErrInc("nodeInit")
+					return err
+				}
+				log.Infof("Enabled feature %s in CNINode for node %s if not existing", rcv1alpha1.CustomNetworking, c.myNodeName)
 			}
-			log.Infof("Enabled feature %s in CNINode for node %s if not existing", rcv1alpha1.CustomNetworking, c.myNodeName)
 		} else {
 			log.Errorf("No ENIConfig could be found for this node", err)
 		}