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.

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

Add VlanId in the cmdAdd Result struct #1705

Merged
merged 20 commits into from
Jan 28, 2022
Merged

Conversation

cgchinmay
Copy link
Contributor

@cgchinmay cgchinmay commented Oct 21, 2021

This VlanId will appear in the prevResult during cmdDel request
The cni can then fetch the vlanId and delete the network associated with vlanId
This will help prevent calls made to api server from ipamd to fetch the vlan device information

#1644
#1313

Tested cni and ipamd integration tests
Test with e2e tests

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@cgchinmay cgchinmay marked this pull request as ready for review October 26, 2021 03:52
@jayanthvn jayanthvn added this to the v1.10.1 milestone Nov 2, 2021
@cgchinmay cgchinmay changed the title Add VlanId in the cmdAdd Result struct Add VlanId in the cmdAdd Result struct [Update test agent after merging this PR] Nov 3, 2021
@cgchinmay cgchinmay requested a review from a team as a code owner November 13, 2021 01:51
@jayanthvn
Copy link
Contributor

Can you please fix the conflict - test/framework/resources/k8s/utils/daemonset.go

@cgchinmay cgchinmay force-pushed the vlan_id_fix branch 2 times, most recently from 1b29040 to deb1f0c Compare December 9, 2021 21:50
@cgchinmay cgchinmay changed the title Add VlanId in the cmdAdd Result struct [Update test agent after merging this PR] Add VlanId in the cmdAdd Result struct [Update test agent before merging this PR] Dec 9, 2021
This VlanId will appear in the prevResult during cmdDel request

CleanUp Pod Network using vlanId from prevResult in CNI itself

Skip processing Delete request if prevResult is nil
Add Logging vlanId to ipamd

Add support to test with containerd nodegroup in pod-eni test

Add check for empty Netns() in cni

Updated test agent version and Image
@jayanthvn
Copy link
Contributor

@cgchinmay - Even here branch needs update.

cmd/routed-eni-cni-plugin/cni.go Outdated Show resolved Hide resolved
cmd/routed-eni-cni-plugin/cni.go Show resolved Hide resolved
cmd/routed-eni-cni-plugin/cni.go Show resolved Hide resolved
misc/10-aws.conflist Show resolved Hide resolved
Copy link
Contributor

@jayanthvn jayanthvn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@cgchinmay cgchinmay changed the title Add VlanId in the cmdAdd Result struct [Update test agent before merging this PR] Add VlanId in the cmdAdd Result struct Jan 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants