Skip to content

[release/1.7 backport] Windows: Supply windows shim version via file#10403

Merged
samuelkarp merged 2 commits intocontainerd:release/1.7from
thaJeztah:1.7_backport_hcsshim_version
Jul 1, 2024
Merged

[release/1.7 backport] Windows: Supply windows shim version via file#10403
samuelkarp merged 2 commits intocontainerd:release/1.7from
thaJeztah:1.7_backport_hcsshim_version

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Somewhat similar to how we supply the version of runc to grab for testing via
a file in script/, this change supplies the Windows shim version to build off
of via a file in the same directory. This seems like a decent home given it now
lives next to the script that pulls and builds the shim to include in our build
artifacts/locally.

The motivation behind this change is:

Cut down on unneccessary hcsshim vendorings if no library code for containerd
changed. It was some what clunky how the Windows builds work today. The Windows
shim is developed out of tree at github.com/microsoft/hcsshim. To let containerd know
what tag to build the shim off of we'd vendor hcsshim into containerd, and then
parse the version string from go.mod, fetch this tag, and then build the shim and
include it in our artifacts. As mentioned, often times the vendoring would bring in
no actual changes that would affect containerd's usage of hcsshim as a library, and
would just serve as a means to bump the version of the containerd shim we should build.

Now this process can be a one line change and we can avoid the possible headaches that come
with bumping go.mod (bumping other unrelated deps etc.)

dcantah and others added 2 commits June 29, 2024 00:37
Somewhat similar to how we supply the version of runc to grab for testing via
a file in script/, this change supplies the Windows shim version to build off
of via a file in the same directory. This seems like a decent home given it now
lives next to the script that pulls and builds the shim to include in our build
artifacts/locally.

The motivation behind this change is:

Cut down on unneccessary hcsshim vendorings if no library code for containerd
changed. It was some what clunky how the Windows builds work today. The Windows
shim is developed out of tree at github.com/microsoft/hcsshim. To let containerd know
what tag to build the shim off of we'd vendor hcsshim into containerd, and then
parse the version string from go.mod, fetch this tag, and then build the shim and
include it in our artifacts. As mentioned, often times the vendoring would bring in
no actual changes that would affect containerd's usage of hcsshim as a library, and
would just serve as a means to bump the version of the containerd shim we should build.

Now this process can be a one line change and we can avoid the possible headaches that come
with bumping go.mod (bumping other unrelated deps etc.)

Signed-off-by: Danny Canter <[email protected]>
(cherry picked from commit 15b13fb)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
update the version to match what was previously obtained from
the module version.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah requested review from dmcgowan and kiashok June 28, 2024 22:50
@thaJeztah thaJeztah self-assigned this Jun 28, 2024
@samuelkarp samuelkarp merged commit 5a587e8 into containerd:release/1.7 Jul 1, 2024
@thaJeztah thaJeztah deleted the 1.7_backport_hcsshim_version branch July 1, 2024 22:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants