Fix install_cni_chaining not creating CNI conf correctly in some cases #6506
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
The chaining CNI conf was not created correctly under two conditions: 1. If there is non CNI conf file in the directory, like a kubeconfig required by the primary CNI. 2. If the CNI conf file is created but not completely written yet. The patch ensures it only selects valid CNI conf and waits for it to be written before using it to create the chaining CNI conf. Signed-off-by: Quan Tian <quan.tian@broadcom.com>
tnqn
added
action/backport
|
cc @tnn-simon |
|
LGTM. I have not managed to reproduce the bug after applying this fix. |
@tnn-simon thanks for reviewing and testing. |
jianjuns
approved these changes
Jul 5, 2024
|
/skip-all |
tnqn
added a commit
to tnqn/antrea
that referenced
this pull request
Jul 8, 2024
antrea-io#6506) The chaining CNI conf was not created correctly under two conditions: 1. If there is non CNI conf file in the directory, like a kubeconfig required by the primary CNI. 2. If the CNI conf file is created but not completely written yet. The patch ensures it only selects valid CNI conf and waits for it to be written before using it to create the chaining CNI conf. Signed-off-by: Quan Tian <quan.tian@broadcom.com>
tnqn
added a commit
to tnqn/antrea
that referenced
this pull request
Jul 8, 2024
antrea-io#6506) The chaining CNI conf was not created correctly under two conditions: 1. If there is non CNI conf file in the directory, like a kubeconfig required by the primary CNI. 2. If the CNI conf file is created but not completely written yet. The patch ensures it only selects valid CNI conf and waits for it to be written before using it to create the chaining CNI conf. Signed-off-by: Quan Tian <quan.tian@broadcom.com>
tnqn
added a commit
to tnqn/antrea
that referenced
this pull request
Jul 8, 2024
antrea-io#6506) The chaining CNI conf was not created correctly under two conditions: 1. If there is non CNI conf file in the directory, like a kubeconfig required by the primary CNI. 2. If the CNI conf file is created but not completely written yet. The patch ensures it only selects valid CNI conf and waits for it to be written before using it to create the chaining CNI conf. Signed-off-by: Quan Tian <quan.tian@broadcom.com>
tnqn
added a commit
that referenced
this pull request
Jul 9, 2024
#6506) (#6510) The chaining CNI conf was not created correctly under two conditions: 1. If there is non CNI conf file in the directory, like a kubeconfig required by the primary CNI. 2. If the CNI conf file is created but not completely written yet. The patch ensures it only selects valid CNI conf and waits for it to be written before using it to create the chaining CNI conf. Signed-off-by: Quan Tian <quan.tian@broadcom.com>
tnqn
added a commit
that referenced
this pull request
Jul 9, 2024
#6506) (#6509) The chaining CNI conf was not created correctly under two conditions: 1. If there is non CNI conf file in the directory, like a kubeconfig required by the primary CNI. 2. If the CNI conf file is created but not completely written yet. The patch ensures it only selects valid CNI conf and waits for it to be written before using it to create the chaining CNI conf. Signed-off-by: Quan Tian <quan.tian@broadcom.com>
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.
The chaining CNI conf was not created correctly under two conditions:
The patch ensures it only selects valid CNI conf and waits for it to be written before using it to create the chaining CNI conf.
Fixes #6499