Skip to content

Commit

Permalink
reduce api calls (#2575)
Browse files Browse the repository at this point in the history
  • Loading branch information
jchen6585 authored Sep 19, 2023
1 parent 879363d commit fff09ec
Showing 1 changed file with 20 additions and 13 deletions.
33 changes: 20 additions & 13 deletions pkg/ipamd/ipamd.go
Original file line number Diff line number Diff line change
Expand Up @@ -547,23 +547,30 @@ func (c *IPAMContext) nodeInit() error {
}, 30*time.Second)
}

node, err := k8sapi.GetNode(ctx, c.k8sClient)
if err != nil {
log.Errorf("Failed to get node", err)
podENIErrInc("nodeInit")
return err
}

eniConfigName, err := eniconfig.GetNodeSpecificENIConfigName(node)
if err == nil && c.useCustomNetworking && eniConfigName != "default" {
// Add the feature name to CNINode of this node
err := c.AddFeatureToCNINode(ctx, rcv1alpha1.CustomNetworking, eniConfigName)
if c.useCustomNetworking {
// When custom networking is enabled and a valid ENIConfig is found, IPAMD patches the CNINode
// resource for this instance. The operation is safe as enabling/disabling custom networking
// requires terminating the previous instance.
node, err := k8sapi.GetNode(ctx, c.k8sClient)
if err != nil {
log.Errorf("Failed to add feature custom networking into CNINode", err)
log.Errorf("Failed to get node", err)
podENIErrInc("nodeInit")
return err
}
log.Infof("Enabled feature %s in CNINode for node %s if not existing", rcv1alpha1.CustomNetworking, c.myNodeName)

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
}
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)
}
}

if c.enablePodENI {
Expand Down

0 comments on commit fff09ec

Please sign in to comment.