Merge updates to release-1.13 branch for VPC CNI release (#2430)

* refactor canary test to access images from AWS registries (#2398) * skip delete test cluster to debug (#2414) * Revert "skip delete test cluster to debug (#2414)" (#2415) This reverts commit 7c30943. * authenticate to test image registry (#2417) * fix hard-coded nitro instances (#2428) * move authentication step from test canary script (#2429) * node initialization must come after primary ENI's security groups are synced to cache --------- Co-authored-by: Olivia Song <[email protected]>
aws · Jun 16, 2023 · cc06bb4 · cc06bb4
1 parent 0b09af2
commit cc06bb4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/pkg/awsutils/vpc_ip_resource_limit.go b/pkg/awsutils/vpc_ip_resource_limit.go
diff --git a/pkg/ipamd/ipamd.go b/pkg/ipamd/ipamd.go
@@ -439,14 +439,8 @@ func New(rawK8SClient client.Client, cachedK8SClient client.Client) (*IPAMContex
 	checkpointer := datastore.NewJSONFile(dsBackingStorePath())
 	c.dataStore = datastore.NewDataStore(log, checkpointer, c.enablePrefixDelegation)
 
-	err = c.nodeInit()
-	if err != nil {
-		return nil, err
-	}
-
-	mac := c.awsClient.GetPrimaryENImac()
-
 	// Retrieve security groups
+	mac := c.awsClient.GetPrimaryENImac()
 	if c.enableIPv4 && !c.disableENIProvisioning {
 		err = c.awsClient.RefreshSGIDs(mac)
 		if err != nil {
@@ -458,6 +452,11 @@ func New(rawK8SClient client.Client, cachedK8SClient client.Client) (*IPAMContex
 		go wait.Forever(func() { _ = c.awsClient.RefreshSGIDs(mac) }, 30*time.Second)
 	}
 
+	err = c.nodeInit()
+	if err != nil {
+		return nil, err
+	}
+
 	return c, nil
 }
 

diff --git a/scripts/gen_vpc_ip_limits.go b/scripts/gen_vpc_ip_limits.go
@@ -201,8 +201,8 @@ func addManualLimits(limitMap map[string]awsutils.InstanceTypeLimits) map[string
 		"u-9tb1.metal":  {ENILimit: 5, IPv4Limit: 30, HypervisorType: "unknown", IsBareMetal: true},
 		"c5a.metal":     {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown", IsBareMetal: true},
 		"c5ad.metal":    {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown", IsBareMetal: true},
-		"p4de.24xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown", IsBareMetal: false},
-		"c7g.metal":     {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown", IsBareMetal: true},
+		"p4de.24xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro", IsBareMetal: false},
+		"c7g.metal":     {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro", IsBareMetal: true},
 		"bmn-sf1.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown", IsBareMetal: true},
 	}
 	for instanceType, instanceLimits := range manuallyAddedLimits {

diff --git a/scripts/run-canary-test.sh b/scripts/run-canary-test.sh
@@ -11,10 +11,6 @@ GINKGO_TEST_BUILD="$SCRIPT_DIR/../test/build"
 TEST_IMAGE_REGISTRY=${TEST_IMAGE_REGISTRY:-"617930562442.dkr.ecr.us-west-2.amazonaws.com"}
 ADC_REGIONS="us-iso-east-1 us-isob-east-1 us-iso-west-1"
 
-# authenticate into test registry
-echo "authenticate to test image registry in $REGION"
-aws ecr get-login-password --region $REGION | docker login --username AWS --password-stdin ${TEST_IMAGE_REGISTRY}
-
 source "$SCRIPT_DIR"/lib/add-on.sh
 source "$SCRIPT_DIR"/lib/cluster.sh
 source "$SCRIPT_DIR"/lib/canary.sh