Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 7 commits into from
Jun 16, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3fa11dc
refactor canary test to access images from AWS registries (#2398)
oliviassss Jun 2, 2023
68c7e44
skip delete test cluster to debug (#2414)
oliviassss Jun 9, 2023
6ef6a54
Revert "skip delete test cluster to debug (#2414)" (#2415)
oliviassss Jun 9, 2023
14f1e1c
authenticate to test image registry (#2417)
oliviassss Jun 13, 2023
63af995
fix hard-coded nitro instances (#2428)
jdn5126 Jun 16, 2023
1b55e4a
move authentication step from test canary script (#2429)
oliviassss Jun 16, 2023
bb94eec
node initialization must come after primary ENI's security groups are…
jdn5126 Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/awsutils/vpc_ip_resource_limit.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions pkg/ipamd/ipamd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions scripts/gen_vpc_ip_limits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 0 additions & 4 deletions scripts/run-canary-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down