Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated cherry pick of #6506: Fix install_cni_chaining not creating CNI conf correctly in #6510

Conversation

tnqn
Copy link
Member

@tnqn tnqn commented Jul 8, 2024

Cherry pick of #6506 on release-1.15.

#6506: Fix install_cni_chaining not creating CNI conf correctly in

For details on the cherry pick process, see the cherry pick requests page.

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 tnqn added the kind/cherry-pick Categorizes issue or PR as related to the cherry-pick of a bug fix from the main branch to a release label Jul 8, 2024
@tnqn
Copy link
Member Author

tnqn commented Jul 9, 2024

/skip-all

@tnqn tnqn merged commit 5fdc224 into antrea-io:release-1.15 Jul 9, 2024
43 of 48 checks passed
@tnqn tnqn deleted the automated-cherry-pick-of-#6506-upstream-release-1.15 branch July 9, 2024 03:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/cherry-pick Categorizes issue or PR as related to the cherry-pick of a bug fix from the main branch to a release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants