chore: remove legacy kube-init and default to CNI state #3383
Conversation
This file contains hidden or 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
rbtr
added
cns
Collaborator
Author
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
This pull request is stale because it has been open for 2 weeks with no activity. Remove stale label or comment or this will be closed in 7 days |
|
Pull request closed due to inactivity. |
rbtr
force-pushed
the
chore/cleanup-kubeinit
branch
from
c942654 to
3b9b475
Compare
Member
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
rbtr
force-pushed
the
chore/cleanup-kubeinit
branch
from
3b9b475 to
793abc9
Compare
Collaborator
Author
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
There was a problem hiding this comment.
PR Overview
This PR removes legacy Kubernetes initialization code and updates the system to default to using the CNI state for pod information. Key changes include:
- Introducing a new pod info provider in the cni package.
- Renaming and consolidating packages from “cnireconciler” to “cni” and “cns” where applicable.
- Removing legacy version-checking functions and associated tests.
Reviewed Changes
| File | Description |
|---|---|
| cns/stateprovider/cni/podinfoprovider.go | New implementation of the CNI pod info provider. |
| cns/stateprovider/cns/podinfoprovider.go | Updates to use endpoint state from the CNS store instead of legacy CNI state migration. |
| cns/NetworkContainerContract.go | Changes to the key schema for PodInfo, defaulting to PodInterfaceID. |
| cns/stateprovider/cni/statefile_test.go | Package rename from cnireconciler to cni. |
| cns/stateprovider/cni/podinfoprovider_test.go | Test updates matching package renames and function call changes. |
| cns/stateprovider/cni/statefile.go | Package rename from cnireconciler to cni. |
| cns/service/main.go | Updated calls to use the new cni and cns pod info providers and removal of legacy CNI version checks. |
| cns/restserver/internalapi_test.go | Minor test adjustments due to GlobalPodInfoScheme changes. |
| cns/nodesubnet/initialization_test.go | Test updates to use the new CNS pod info provider. |
| cns/NetworkContainerContract_test.go | Removal of deferred reset for GlobalPodInfoScheme. |
| cns/restserver/nodesubnet_test.go | Package and function call updates to use the new CNS and CNI pod info providers. |
| cns/cnireconciler/version*.go | Legacy version checking functions and tests removed. |
Copilot reviewed 14 out of 14 changed files in this pull request and generated no comments.
Comments suppressed due to low confidence (2)
cns/NetworkContainerContract.go:289
- Ensure that using p.PodInterfaceID as the default key is the intended behavior, and that the PodInterfaceID is guaranteed to be unique. If uniqueness cannot be guaranteed, consider using a composite key or revisiting the key schema.
return p.PodInterfaceID
cns/NetworkContainerContract_test.go:60
- Consider restoring GlobalPodInfoScheme to its original value at the end of tests (or using proper test isolation) to prevent side effects on subsequent tests.
GlobalPodInfoScheme = InterfaceIDPodInfoScheme
793abc9 to
6b5f07e
Compare
Collaborator
Author
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
Author
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
This pull request is stale because it has been open for 2 weeks with no activity. Remove stale label or comment or this will be closed in 7 days |
|
This pull request is stale because it has been open for 2 weeks with no activity. Remove stale label or comment or this will be closed in 7 days |
|
Pull request closed due to inactivity. |
rbtr
added
exempt-stale
|
This pull request is stale because it has been open for 2 weeks with no activity. Remove stale label or comment or this will be closed in 7 days |
Signed-off-by: Evan Baker <[email protected]>
Signed-off-by: Evan Baker <[email protected]>
Signed-off-by: GitHub <[email protected]>
rbtr
force-pushed
the
chore/cleanup-kubeinit
branch
from
143ff7c to
e6a9160
Compare
Collaborator
Author
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
jpayne3506
approved these changes
Jun 13, 2025
nddq
approved these changes
Jun 13, 2025
sivakami-projects
pushed a commit
that referenced
this pull request
Oct 23, 2025
* chore: remove legacy kube-init and default to CNI state Signed-off-by: Evan Baker <[email protected]> * refactor podinfoproviders Signed-off-by: Evan Baker <[email protected]> * fix lints Signed-off-by: GitHub <[email protected]> --------- Signed-off-by: Evan Baker <[email protected]> Signed-off-by: GitHub <[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:
Removes the legacy Kubernetes init and makes CNI init the code default. 🚮
Reconcile initial state from CNI has been the default (via config) since CNI 1.4.7 (so at least AKS 1.27). It's been in use for so long that we're starting to roll off of it, also, to the new CNS managed state.
Issue Fixed:
Requirements:
Notes: