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

[release/1.6] Fix compile from version control system (source) use case #10011

Merged

Conversation

austinvazquez
Copy link
Member

@austinvazquez austinvazquez commented Mar 28, 2024

Issue

Resolves #9969

The module github.com/mitchellh/osext is no longer available via source. The issue is it is currently a indirect dependency via containerd/aufs@v1.0.0 (see containerd/aufs#49 (comment)) and Microsoft/hcsshim@v0.9.10.

Description

This change excludes the github.com/mitchellh/osext indirect dependency to resolve compile from source use case issue due to dependency no longer being available.

Testing

go clean -modcache
export GOPROXY=direct
go mod tidy
go mod vendor

Additional context

@k8s-ci-robot
Copy link

Hi @austinvazquez. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@austinvazquez austinvazquez changed the title Fix compile from version control system (source) use case [release/1.6] Fix compile from version control system (source) use case Mar 28, 2024
This change excludes the github.com/mitchellh/osext indirect dependency
to resolve compile from source use case issue due to dependency no
longer being available.

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
@austinvazquez
Copy link
Member Author

xref: #10012 (comment)

@austinvazquez
Copy link
Member Author

/cc @thaJeztah @cpuguy83

@estesp estesp merged commit 9bd5680 into containerd:release/1.6 Apr 2, 2024
46 checks passed
@austinvazquez austinvazquez deleted the fix-offline-compilation branch April 2, 2024 22:43
corhere added a commit to corhere/containerd that referenced this pull request Apr 5, 2024
containerd 1.6.31

Welcome to the v1.6.31 release of containerd!

The thirty-first patch release for containerd 1.6 contains a few fixes, one for
a regression that was introduced in v1.6.30 in the way process exits were handled.

* Adds mediatype to OCI index record on export ([containerd#9991](containerd#9991))

* Fix runc shim to only defer init process exits ([containerd#10038](containerd#10038))

Please try out the release binaries and report any issues at
https://github.com/containerd/containerd/issues.

* Derek McGowan
* Phil Estes
* Akihiro Suda
* Austin Vazquez
* Laura Brehm
* Maksym Pavlenko
* Sebastiaan van Stijn
* Talon

<details><summary>14 commits</summary>
<p>

* Prepare for v1.6.31 release ([containerd#10040](containerd#10040))
  * [`7f7012bad`](containerd@7f7012b) Prepare for v1.6.31 release
* Fix runc shim to only defer init process exits ([containerd#10038](containerd#10038))
  * [`5e53da4a1`](containerd@5e53da4) runc-shim: only defer init process exits
* Fix compile from version control system (source) use case ([containerd#10011](containerd#10011))
  * [`7592f87f0`](containerd@7592f87) Fix compile from version control system (source) use case
* Adds mediatype to OCI index record on export ([containerd#9991](containerd#9991))
  * [`8d415fd0e`](containerd@8d415fd) adds mediatype to oci index record
* vendor: google.golang.org/protobuf 1.33.0, github.com/golang/protobuf v1.5.4 ([containerd#9974](containerd#9974))
  * [`2dbb59b5a`](containerd@2dbb59b) vendor: github.com/golang/protobuf v1.5.4
  * [`069bb78c9`](containerd@069bb78) build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0
  * [`68d395cad`](containerd@68d395c) build(deps): bump google.golang.org/protobuf from 1.31.0 to 1.32.0
* Backport test release on PR ([containerd#9955](containerd#9955))
  * [`b3713136d`](containerd@b371313) CI: test release.yml on every PR
</p>
</details>

* **github.com/golang/protobuf**  v1.5.3 -> v1.5.4
* **google.golang.org/protobuf**  v1.31.0 -> v1.33.0

Previous release can be found at [v1.6.30](https://github.com/containerd/containerd/releases/tag/v1.6.30)
TomSweeneyRedHat added a commit to TomSweeneyRedHat/common that referenced this pull request Sep 17, 2024
Exclude the old, outdated, and problematic
github.com/mitchellh/osext which was being dragged in
by containerd.

This is what containerd did in containerd/containerd#10011
and included it in 1.6.31.  I tried bumping first to 1.6.31, but
that dragged in a lot of stuff.  I think this is safer, if it works.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants