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

Use CRI to obtain pod sandbox IDs instead of Kubernetes API (#714) #741

Merged
merged 1 commit into from
Dec 5, 2019

Conversation

mogren
Copy link
Contributor

@mogren mogren commented Dec 4, 2019

Description of changes:

Cherry pick of PR #714 against the release-1.6 branch by @drakedevel back to master.

  • Add initial proof-of-concept implementation of CRI support.
  • Update CRI socket path to /var/run/cri.sock
  • Filter ready sandboxes and abort if there's a pod UID conflict.
  • Revert "fix: get container ID from kube rather than docker (fix: get container ID from kube rather than docker #371)"
    This reverts commit 14de538.
  • Address review comments, refactor to use pod sandbox nomenclature consistently.
  • Bail if we can't retrieve local pod sandboxes on startup.

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

* Revert "fix: get container ID from kube rather than docker (aws#371)"

This reverts commit 14de538.

* go mod tidy

* Add initial proof-of-concept implementation of CRI support.

* Update CRI socket path to /var/run/cri.sock

* Filter ready sandboxes and abort if there's a pod UID conflict.

* Revert "fix: get container ID from kube rather than docker (aws#371)"

This reverts commit 14de538.

* Address review comments, refactor to use pod sandbox nomenclature consistently.

* Bail if we can't retrieve local pod sandboxes on startup.
@mogren mogren requested a review from jaypipes December 4, 2019 21:39
Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

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

Yup, ++

@jaypipes jaypipes merged commit 7c6dec7 into aws:master Dec 5, 2019
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.

3 participants