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

Add retries for cni conf file #864

Merged
merged 1 commit into from
Jun 24, 2020
Merged

Conversation

reachjainrahul
Copy link
Contributor

@reachjainrahul reachjainrahul commented Jun 24, 2020

In CNI chain option, add retry to look for primary
cni config file before adding antrea config in it

Fixes #863

@vmwclabot
Copy link

@reachjainrahul, VMware has rejected your signed contributor license agreement. The merge can not proceed until the agreement has been resigned. Click here to resign the agreement.

@antrea-bot
Copy link
Collaborator

Thanks for your PR.
Unit tests and code linters are run automatically every time the PR is updated.
E2e, conformance and network policy tests can only be triggered by a member of the vmware-tanzu organization. Regular contributors to the project should join the org.

The following commands are available:

  • /test-e2e: to trigger e2e tests.
  • /skip-e2e: to skip e2e tests.
  • /test-conformance: to trigger conformance tests.
  • /skip-conformance: to skip conformance tests.
  • /test-whole-conformance: to trigger all conformance tests on linux.
  • /skip-whole-conformance: to skip all conformance tests on linux.
  • /test-networkpolicy: to trigger networkpolicy tests.
  • /skip-networkpolicy: to skip networkpolicy tests.
  • /test-windows-conformance: to trigger windows conformance tests.
  • /skip-windows-conformance: to skip windows conformance tests.
  • /test-all: to trigger all tests (except whole conformance).
  • /skip-all: to skip all tests (except whole conformance).

These commands can only be run by members of the vmware-tanzu organization.

Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if [[ ! -z $cni_conf ]]; then
break
fi
sleep 2s
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we add some logging? otherwise it would be confusing the initContainer keeps running without any message if the cni conf is not available for a long time.
You may source logging and use log_info like https://github.com/vmware-tanzu/antrea/blob/master/build/images/scripts/start_ovs#L14

In CNI chain option, add retry to look for primary
cni config file before adding antrea config in it
Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @reachjainrahul.
The current CI tests don't cover the change made in this PR so I would skip them.
@reachjainrahul Please let me know once you have verified it manually then we can merge.

@tnqn
Copy link
Member

tnqn commented Jun 24, 2020

/skip-all

@tnqn tnqn merged commit c82328e into antrea-io:master Jun 24, 2020
GraysonWu pushed a commit to GraysonWu/antrea that referenced this pull request Sep 22, 2020
In CNI chain option, add retry to look for primary
cni config file before adding antrea config in it
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Antrea conf is not populated in EKS if node is scaled up
4 participants