fix: update error message for MTPNC not found and not ready in CNS #3776
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
There was a problem hiding this comment.
Pull Request Overview
This PR improves the error path when a MultitenantPodNetworkConfig (MTPNC) is missing by introducing a specific “not found” error that Kubernetes kubelet will recognize to retry faster, and it adds unit tests to cover these new error messages.
- Introduce
errMTPNCNotFoundand wrap cache-get errors so they return a “network is not ready” prefix - Update
getIPConfigandgetMTPNCto return the new wrapped error - Add and adjust unit tests to assert on the new error wrapping and message contents
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| cns/middlewares/k8sSwiftV2.go | Added errMTPNCNotFound, getMTPNCNotFoundErr, and updated error returns in cache‐get failures |
| cns/middlewares/k8sSwiftV2_linux_test.go | Imported errors and strings, and extended tests to check for "network is not ready" in error messages |
Comments suppressed due to low confidence (2)
cns/middlewares/k8sSwiftV2_linux_test.go:252
- To mirror the earlier
errors.Ischeck for the "not found" case, consider addingassert.Assert(t, errors.Is(err, errMTPNCNotReady), ...)here so you verify the wrapping for the "not ready" error as well.
assert.Error(t, err, errMTPNCNotReady.Error()) cns/middlewares/k8sSwiftV2.go:31
- Make sure you have added
import "fmt"at the top of this file so thatfmt.Errorfcompiles correctly.
var getMTPNCNotFoundErr = func(err error) error { 
4 tasks
| /azp run Azure Container Networking PR |
| Azure Pipelines successfully started running 1 pipeline(s). |
MikeZappa87 reviewed Jul 8, 2025
| /azp run Azure Container Networking PR |
| Azure Pipelines successfully started running 1 pipeline(s). |
| /azp run Azure Container Networking PR |
| Azure Pipelines successfully started running 1 pipeline(s). |
| @isaac-dasan title reads mtpnc not found but we also cover dhcp discover failed case. I would like to have separate PR for returning network not ready if dhcp discover failed |
isaac-dasan changed the title isaac-dasan changed the title | /azp run Azure Container Networking PR |
| Azure Pipelines successfully started running 1 pipeline(s). |
4 tasks
rbtr reviewed Jul 9, 2025
rbtr previously approved these changes Jul 9, 2025
| /azp run Azure Container Networking PR |
| Azure Pipelines successfully started running 1 pipeline(s). |
QxBytes reviewed Jul 10, 2025
QxBytes approved these changes Jul 10, 2025
| /azp run Azure Container Networking PR |
| Azure Pipelines successfully started running 1 pipeline(s). |
santhoshmprabhu approved these changes Jul 10, 2025
| /azp run Azure Container Networking PR |
| Azure Pipelines successfully started running 1 pipeline(s). |
| @microsoft-github-policy-service rerun |
isaac-dasan force-pushed the isaac/swiftv2/errormessage/ut branch from 40b0c5c to 9b3bdbe Compare 
Signed-off-by: GitHub <noreply@github.com>
isaac-dasan force-pushed the isaac/swiftv2/errormessage/ut branch from 9b3bdbe to ca1b3c2 Compare | /azp run Azure Container Networking PR |
| Azure Pipelines successfully started running 1 pipeline(s). |
| @microsoft-github-policy-service rerun |
github-merge-queue bot removed this pull request from the merge queue due to failed status checks | @microsoft-github-policy-service rerun |
isaac-dasan added a commit that referenced this pull request Jul 11, 2025
…3776) squash commit to prevent github CLA issue Signed-off-by: GitHub <noreply@github.com>
isaac-dasan added a commit that referenced this pull request Jul 11, 2025
…3776) squash commit to prevent github CLA issue Signed-off-by: GitHub <noreply@github.com>
github-merge-queue bot pushed a commit that referenced this pull request Jul 11, 2025
…found and not ready in CNS (#3775) * fix: update network error msg to match kubelet expectations (#3768) update network error msg to match kubelet expectations Signed-off-by: GitHub <noreply@github.com> * fix: update error message for MTPNC not found and not ready in CNS (#3776) squash commit to prevent github CLA issue Signed-off-by: GitHub <noreply@github.com> --------- Signed-off-by: GitHub <noreply@github.com>
NihaNallappagari pushed a commit to NihaNallappagari/azure-container-networking that referenced this pull request Sep 4, 2025
…zure#3776) squash commit to prevent github CLA issue Signed-off-by: GitHub <noreply@github.com>
sivakami-projects pushed a commit that referenced this pull request Oct 23, 2025
…3776) squash commit to prevent github CLA issue Signed-off-by: GitHub <noreply@github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
7 participants
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:
This is a perf fix. The particular error message "network is not ready" will make kubelet retry with faster backOffInterval than default error messages.
https://github.com/kubernetes/kubernetes/blob/efd2a0d1f514be96a2f012fc3cb40f7c872b4e67/pkg/kubelet/pod_workers.go#L1495C2-L1501C3
Requirements:
Notes: