fix: setdir in CNI client #2027
Merged
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
jaer-tsun
approved these changes
Jun 21, 2023
so invoking from inside the CNS Pod works on Windows Signed-off-by: Evan Baker <[email protected]>
| @@ -30,7 +24,7 @@ func New(exec utilexec.Interface) *client { | |||
|
|
|||
| func (c *client) GetEndpointState() (*api.AzureCNIState, error) { | |||
| cmd := c.exec.Command(platform.CNIBinaryPath) | |||
|
|
|||
| cmd.SetDir(CNIExecDir) | |||
There was a problem hiding this comment.
add a comment to say this work in windows only if state exists in c:\k
| @@ -30,7 +24,7 @@ func New(exec utilexec.Interface) *client { | |||
|
|
|||
| func (c *client) GetEndpointState() (*api.AzureCNIState, error) { | |||
| cmd := c.exec.Command(platform.CNIBinaryPath) | |||
|
|
|||
| cmd.SetDir(CNIExecDir) | |||
There was a problem hiding this comment.
if CNIExecDir is empty, SetDir will skip setting directory?
There was a problem hiding this comment.
jaer-tsun
pushed a commit
to jaer-tsun/azure-container-networking
that referenced
this pull request
Jul 17, 2023
so invoking from inside the CNS Pod works on Windows Signed-off-by: Evan Baker <[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:
Sets the working directory when CNS invokes the CNI (only on Windows) so that the CNS reconcile from CNI finds the real CNI statefile and reinitializes the CNS state correctly.
Issue Fixed:
Due to the lack of CNIRuntimePath set when CNI is running on Windows: when CNS invokes CNI to restore state during initialization on Windows, it looks for the statefile in the local directory (
.\azure-vnet.json) instead of the absolute path atC:\k\azure-vnet.json. No statefile exists in the current directory, so the CNI returns empty PodInfo to CNS, leading CNS to think there are no Pods scheduled and that all of its IPs are available.Running a CNS built with this change, we can see that it finds the CNI statefile and correctly restores from it:
restoring CNS to the previous version and restarting shows that the statefile is not used:
Requirements:
Notes: