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

Copy the binary and config after ipamd is ready #576

Merged
merged 1 commit into from
Aug 7, 2019

Conversation

mogren
Copy link
Contributor

@mogren mogren commented Aug 7, 2019

Issue #, if available: #282, #575

Description of changes:

  • Copy the plugin and config from within ipamd instead to avoid having to poll in bash.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@mogren mogren force-pushed the copy-files-in-go branch from 6e9da51 to 86e6156 Compare August 7, 2019 17:00
@mogren mogren mentioned this pull request Aug 7, 2019
Copy link
Member

@micahhausler micahhausler left a comment

Choose a reason for hiding this comment

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

Approved

return 1
}

log.Info("Copying /app/10-aws.conflist to /host/etc/cni/net.d/10-aws.conflist")
Copy link
Member

Choose a reason for hiding this comment

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

I think this is fine for now, but do we want to parameterize this filename? I'm take it or leave it

return 0
}

// copyFileContents copies a file
func copyFileContents(src, dst string) error {
Copy link
Member

Choose a reason for hiding this comment

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

Should we have a test for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Adding in a separate PR.

@mogren mogren merged commit f9acdeb into aws:master Aug 7, 2019
@mogren mogren deleted the copy-files-in-go branch September 26, 2019 23:02
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.

2 participants