Added gRPC Server Boilerplate Code for CNS #2745
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
debecerra
reviewed
May 21, 2024
timraymond
reviewed
May 22, 2024
debecerra
reviewed
May 24, 2024
debecerra
reviewed
May 24, 2024
debecerra
reviewed
May 24, 2024
debecerra
reviewed
May 24, 2024
debecerra
reviewed
May 24, 2024
debecerra
reviewed
May 28, 2024
timraymond
reviewed
May 29, 2024
timraymond
reviewed
May 29, 2024
Kevincxv
changed the title
debecerra
reviewed
Jun 10, 2024
debecerra
previously approved these changes
Jun 11, 2024
There was a problem hiding this comment.
I think all of my feedback has been addressed, looks good to me 🙂 Think we might just need a final review from @ramiro-gamarra
ramiro-gamarra
previously approved these changes
Jun 13, 2024
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
debecerra
approved these changes
Jun 13, 2024
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
ramiro-gamarra
approved these changes
Jun 14, 2024
paulyufan2
added a commit
that referenced
this pull request
Jun 18, 2024
* PB Operations * Added gRPC Boilerplate Code * Updated package * Minor Fixes * gRPC Boilerplate * Minor Changes * Feedback PB Changes * Ignored dotnet * Improved Logging * PB Operations with Gen Code * Cherry Picking PB Operations * SetOrchestratorInfo Implementation * gRPC Boilerplate Server Startup * FIxed Merge Conflicts * Resolved Merge Conflicts * Removed gitignore * Add gRPC Protobuf Files for CNS Operations (#2754) * PB Operations * Updated Protobuf Service Name * Package Rename --------- Co-authored-by: Kevin <[email protected]> * refactor: code changes for stateless cni and swift v2 (#2688) * ci: changes up to endpointInternal * ci: remove defaultInterface from invoker * ci: change up to CreateEndpoint * ci: changes up to CreateEndpoint() * ci: invoker cns and UT fixes * ci: add fixes to UT(s), capture non populated defaultInterface failures * ci: multitenancy changes * ci: invoker azure changes & remove all defaultInterfaceInfo possible * ci add NICType to baremetal flow * chore: address comments * merge nw info fields to ep info and draft new createEndpoint function * restruct ipamAddResult struct * reorder code to create epinfo first, and then create network and ep based on epinfo * add getNwInfo and generate ipamAddResult * fix network windows.go * create nw info first and create nw and ep dns info * fix testIpamAddFail ut referencing wrong redeclared err variable, fix error message * UT fix part one * fix the getNetworkID and getNetworkInfo * move create endpoint to network package, remove ifIndex as needed * use function to get network id * unify creation of nw and endpoint info by removing switch * change functions to consume ep info instead of nw info * remove unused variable accidentally added earlier * update old azure ipam invoker to use ep info and change ids to network ids when appropriate previously we renamed the NetworkInfo symbol to EndpointInfo in lots of places, but the Id in Network Info is NOT the same as Endpoint Info, so while the code compiles, code that previously used the id field of the network info struct would now be using the id field of the endpoint info struct. It should use the NetworkId field of the endpoint info struct instead. * rename endpoint info id field to EndpointID to remove ambiguity * change nw info to ep info in windows * adjust comments * move all methods in create ep info dependent on nw info to use ep info instead (windows and linux) addSubnetToNetworkInfo, setNetworkOptions, and getEndpointPolicies. getEndpointPolicies will now take just the subnets needed as a parameter rather than the whole nw or ep info. * make cnm compile (not necessarily correct) * make all tests compile except endpoint test secondary client (windows and linux) (not necessarily correct) * comment out endpoint test secondary endpoint client case to make tests compile * address todos and comments from meeting * remove duplicated code for populating address in ep info generation * update EndpointCreate to support multiple infra nic * save all endpoints to state, regardless of type, use either stateless or cni statefile undos some changes in "move create endpoint to network package, remove ifIndex as needed" deletion flow needs to figure out how to tell if the nic type is delegated 1 interface info : 1 endpoint info : 1 endpoint struct mapping * fix dual nic support conditional and finding master interface ip the master interface ip must be in a particular form where the last few bits are zeroed out based on the mask or we won't find the ip for example, while the host subnet perfix is 10.224.0.113/16, the ip that should be passed into find master interface (subnet) should be 10.224.0.0/16 which matches one of the interfaces' ipnet (10.224.0.0/16) * fix empty network name when we need to create a network, we collect the network information, but if we do not find the network, we return an empty nw info and an error when we create the endpoint we need to use endpoint info's network id, not the (possibly) empty network info struct's network id * make network_test.go compile (linux and windows compile) unit tests are not necessarily correct at this point * add NICType to endpoint struct and populate it important: when getting the endpoint state, the NIC Type field is not populated, leading to deletes not having a NIC Type; this should be changed so that getting the state populates that field including the nic type allows us to simplify the secondary endpoints delete flow (just check if the nic type is delegated instead of checking if the secondary interfaces map is populated) smoke tested: linux aks podsubnet (same vm, multi vm, internet, cni statefile consistent) linux standalone transparent vlan multitenancy (same vm, multi vm, internet, multi vnet, no connection between coke pepsi, cni statefile consistent) windows standalone bridge multitenancy single customer (same vm connections, internet, dns only, cni statefile consistent, 2 pods deleting and recreating) * ci: InterfaceInfo Map * fix multitenancy_test ut by changing key * add endpoint id to secondary ep info test since we populate the id in the actual flow * fix cni network_test linux and ensure secondary create ep info does not break in network_test we pass in sample delegated (secondary) data to Add which we then create endpoint info from even with most fields empty, in linux, the ep info is created without erroring * make invoker_cns_test linux pass running all linux package tests for network and cni package pass (or also fail on master, like createBridge) windows unit tests mostly all fail for the same ones on master and this branch summary: - network_windows_test.go ○ TestFailToAddIPv6DefaultRoute already fails on master - network_test.go ○ 9 tests fail on master, 9 tests fail on my branch - manager_test.go ○ 9 tests fail on master, 9 tests fail on my branch - endpoint_windows_test.go ○ TestNewAndDeleteEndpointImplHnsV2 already timeouts on master - endpoint_test.go ○ 9 tests fail on master, 9 tests fail on my branch - network_windows_test.go ○ FAIL: TestPluginSecondAddSamePodWindows/CNI_consecutive_add_already_hot_attached ○ FAIL: TestPluginSecondAddSamePodWindows/CNI_consecutive_add_not_hot_attached ○ We don't handle consecutive add anymore - network_test.go ○ TestPluginMultitenancyAdd/Add_Happy_path fails on master and my branch (received multiple NC results [] from CNS while dualnic feature is not supported)-- we still get two items on our list/map though which is expected - invoker_cns_test passes - invoker_azure_test passes - multitenancy_test passes The consecutive add tests fail but that is expected since we no longer support it. * modify delete flow to handle multiple epinfos to delete delete ALL endpoints related to the endpoint infos list in the event cni fails half-way through an add (one failed endpoint create and we delete all would-be-create endpoints and the state) replace looping over deletion code "n" number of times with getting a slice of endpoint infos to delete modify stateless cni code to retrieve a slice of network endpoint infos from a single response based on the container id (container id can be used in stateless cni for retrieval) incorporate stateless cni changes from other branch (cns client/ipam/restserver changes) modify get endpoint state to return slice of endpoint infos, and getting an endpoint will return an endpoint from that slice with nic type infra move edge case where endpoint is not created in the state but ips are already allocated to immediately after retrieving all ep infos fix mock behavior for getting all endpoints by container id move getting network id and network info out of the loop because their values do not seem to change between iterations move deletion of endpoint logic into a dedicated loop, and then create a dedicate loop for calling ipam delete to prevent inconsistent state all expected unit tests on linux pass * address feedback * Make change to UpdateEndpointState API to support SwiftV2 for Stateless CNI * change save state to only call update endpoint state once with a slice of endpoints, uts pass * fix using nonexistent key by passing in current interface info directly * fix azure ipam invoker not getting a populated network info for legacy cni * add L1VH windows support * add nic type to windows endpoints * move adding an external interface code to run only when creating a new network this change reflects prior behavior, where we would only add an external interface to the statefile if the network (after searching through all external interfaces) was not found currently, if there are multiple interfaces that could be selected as the master, we would add each external interface to the statefile, even if the *network* is associated with one of the existing interfaces while we would still always find the same network (thanks to having a constant NetworkId, regardless of the external interface), you could get an extra empty external interface in your statefile this commit should remove that possibility (the extra external interface shouldn't really matter in the first place though because we always select the external interface that has a matching network created on it) this should be os agnostic * update comments, first todo check pass * address some linter issues * rename networkId to networkID in endpoint info ran package tests in windows and linux for cni and network packages ran package tests in linux for cns restserver all have expected outputs (either pass, or also fails on master branch) * address linter issues * preserve more logs and reduce timeout for restart for debugging * clean comments and rename for clarity if we use the endpoint info for the network info fields, we name it nwInfo as a hint * address more linter issues linux network, restserver, and cni package tests pass * Revert "preserve more logs and reduce timeout for restart for debugging" This reverts commit 0f00492. * ignore error on delete flow network query if we are in stateful cni and do not find the network, we will not error, but when we search for the endpoint it will not be found, leading to us calling ipam invoker delete which is assumed idempotent before returning previously we would error in stateful cni and return before calling ipam invoker delete * delete network on endpoint delete if stateless and delegated vmnic (win + linux) * add nic name, set nicname in linux to master interface name stateless will key into interface map with the nicname field in windows, the nicname field is based on the args ifname (usually eth0) in linux, the nicname field is based on the master interface found (usually eth0) note: hostifname/hostvethname = linux veth pair peer in the host ns ifname/contifname = linux veth pair peer in the container ns, in windows it's just the args ifname nicname is something else ifname isn't used during deletion in linux, hns id is used for deletion in windows * return secondary interface as cni result if no infra nic found, include mac address in cni result * address linter issue * fix critical error where failing to add in windows stateless would lead to hns components not being deleted and add netns for hnsv2 tested by triggering a failure to save the stateless state and seeing that the hns endpoint and network are cleaned up we use the endpoint info to clean up on "add" error, but previously, we didn't populate it with the hns ids to do so adds netns to stateless as the presence of a valid guid in netns determines if hnsv2 is used * set nicname used in stateless cni according to feedback * add dummy guid to stateless delete since we assume stateless is always hnsv2 we assume that the netns value isn't used in stateless deletion * clean up createEpInfo, declare endpoint info once * address feedback from vipul * change comments only * revert change to cns package * fix stateless cni migration flow not having nictype on migrate * keep nwInfo variables named the same as before pr (noop) * separate endpoint and network policies in endpoint info behavior should not change except in hnsv1, where network policies passed into network create call will NOT include endpoint policies endpoint policies always include network policies * address feedback from reviewers * address feedback and account for case where cns provides info without nic type if nic type is empty from cns in invoker cns, we assume it is infra nic type and populate it with infra nic type * address feedback to declare endpoint info once and populate all fields at once moved add subnets to after endpoint info created moved retrieval of all endpoint policies (from getEndpointPolicies and getPoliciesFromRuntimeCfg)until after endpoint info created network policies are just passed in from the args unaltered * use ifname instead of nicname field in endpoint struct as key in stateless * convert macaddress only nictype is delegatedvmnic * address feedback by removing network dns settings * address linter issues (noop) * address feedback and linter (noop) * remove unused consecutive add funcs (noop) * fix release ips when create a container without nictype using older cni and then upgrade cni and delete if we create a pod with an older cni version, it won't have a nictype if we upgrade cni and then delete, we should treat an empty nictype as an infra nictype and call the invoker delete * prevent eps with delegated nic type present on ep from also calling transparent endpoint client on delete tested on swift v2 linux single pod add, change cni to this version, delete (ok) then add using this cni version and delete, no extraneous transparent endpoint client calls logged * mock get interface method for ut searched for "NetPlugin" in all files and determined all prod use of NetPlugin goes through NewNetPlugin where we set the get interface method to the real interface get method adds ut where the master interface (by mac) is not found * address feedback (noop) * add ut for handling empty nictype on cns add (noop) * add multitenancy delete net not found ut (noop) * add uts for multi interface infos single add call, verify endpoint id, cns to cni data conversion and vice versa, get endpoint info from container id (noop) verifies partial success will delete all endpoints, even successfully created ones in the same cni add call * add ut for all pods associated with container id delete in one del call, new secondary delete flow (noop) * add two UTs * fix a linter issue * add ut to check endpoint ifname on new endpoint creation based on nictype (noop) * add ut for fail to find interface by subnet (noop) * Adding support for Stateless CNI Delete Edge case when there in no HNS ID * fix uts * fix linter issues * fix ut --------- Co-authored-by: jpayne3506 <[email protected]> Co-authored-by: paulyufan2 <[email protected]> Co-authored-by: AzureAhai <[email protected]> * Corrected imports * Final Commit * Updated .gitignore * Added dummy methods for PB operatons * Modularized CNS * Improved configurations * Resolved Concflicts * Resolved cns logic error * Improved config structure * Resolved Conflicts * Updated Main * Removed Config * WIP: 34307ed Fixed return code --------- Co-authored-by: Kevin <[email protected]> Co-authored-by: QxBytes <[email protected]> Co-authored-by: jpayne3506 <[email protected]> Co-authored-by: paulyufan2 <[email protected]> Co-authored-by: AzureAhai <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reason for Change:
Added boilerplate code for setting up a gRPC server in CNS during its startup. It includes the initial setup, configuration, and necessary gRPC server initialization code, enabling CNS to start a gRPC server for enhanced node health monitoring and operations.
Issue Fixed:
Requirements:
Notes: