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 upstream hcsshim instead of fork #8192

Merged
merged 2 commits into from Nov 8, 2023

Conversation

coutinhop
Copy link
Contributor

Use github.com/Microsoft/hcsshim v0.11.4 instead of the fork github.com/projectcalico/hcsshim v0.8.9-calico.

The fork was necessary at the time of v0.8.9 in order to access the endpoint's containers (https://github.com/projectcalico/hcsshim/blob/v0.8.9-calico/internal/hns/hnsendpoint.go#L119-L138), but it is no longer needed since now that information is accessible via the SharedContainers field in the HNSEndpoint struct in the upstream hcsshim package (https://github.com/microsoft/hcsshim/blob/main/internal/hns/hnsendpoint.go#L36).

Description

Related issues/PRs

Todos

  • Tests
  • Documentation
  • Release note

Release Note

Use upstream hcsshim package instead of fork and update it to latest stable version (v0.11.4).

Reminder for the reviewer

Make sure that this PR has the correct labels and milestone set.

Every PR needs one docs-* label.

  • docs-pr-required: This change requires a change to the documentation that has not been completed yet.
  • docs-completed: This change has all necessary documentation completed.
  • docs-not-required: This change has no user-facing impact and requires no docs.

Every PR needs one release-note-* label.

  • release-note-required: This PR has user-facing changes. Most PRs should have this label.
  • release-note-not-required: This PR has no user-facing changes.

Other optional labels:

  • cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.
  • needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.

Use github.com/Microsoft/hcsshim v0.11.4 instead of the fork github.com/projectcalico/hcsshim v0.8.9-calico.

The fork was necessary at the time of v0.8.9 in order to access the endpoint's containers, but it is no longer needed since now that information is accessible via the SharedContainers field in the HNSEndpoint struct in the upstream hcsshim package.
@coutinhop coutinhop added release-note-required Change has user-facing impact (no matter how small) docs-not-required Docs not required for this change labels Nov 8, 2023
@coutinhop coutinhop self-assigned this Nov 8, 2023
@coutinhop coutinhop requested a review from a team as a code owner November 8, 2023 01:54
@marvin-tigera marvin-tigera added this to the Calico v3.27.0 milestone Nov 8, 2023
@coutinhop coutinhop merged commit 8f4b3b3 into projectcalico:master Nov 8, 2023
2 checks passed
@coutinhop coutinhop deleted the pedro-upstream-hcsshim-1 branch November 8, 2023 23:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs-not-required Docs not required for this change release-note-required Change has user-facing impact (no matter how small)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants