Skip to content

[release/1.6] Add stable ABI support in windows platform matcher + update hcsshim tag#8854

Merged
mikebrow merged 2 commits intocontainerd:release/1.6from
kiashok:stableAbi-rel-1.6
Aug 7, 2023
Merged

[release/1.6] Add stable ABI support in windows platform matcher + update hcsshim tag#8854
mikebrow merged 2 commits intocontainerd:release/1.6from
kiashok:stableAbi-rel-1.6

Conversation

@kiashok
Copy link
Copy Markdown
Contributor

@kiashok kiashok commented Jul 20, 2023

This PR does the following:

kiashok added 2 commits July 20, 2023 16:48
@kiashok
Update hcsshim tag to v0.9.10
43a02c0 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
@kiashok
Add support for stable ABI windows versions
f51bf19 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Jul 20, 2023

Hi @kiashok. 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.

Details

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.

@kiashok kiashok changed the title Add stable ABI support in windows platform matcher + update hcsshim tag [release/1.6] Add stable ABI support in windows platform matcher + update hcsshim tag Jul 20, 2023
@kiashok kiashok marked this pull request as ready for review July 21, 2023 04:08
@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Jul 21, 2023

/ok-to-test

@kiashok
Copy link
Copy Markdown
Contributor Author

kiashok commented Jul 21, 2023

@jterry75 @dmcgowan @dcantah could you take a look when you have some time please? Thanks a lot!

@dcantah
Copy link
Copy Markdown
Member

dcantah commented Jul 24, 2023

@kiashok Do we want this in 1.7 also?

@kiashok
Copy link
Copy Markdown
Contributor Author

kiashok commented Jul 24, 2023

@kiashok Do we want this in 1.7 also?

Yes we do. I already have a PR out in containerd/main which are hitting a race condition in transfer service which are unrelated to any of the windows platform matcher code changes being made. That is the reason I submitted a separate PR to containerd/1.6 as it does not have transfer service code.

@dcantah
Copy link
Copy Markdown
Member

dcantah commented Jul 24, 2023

@kiashok ack

@kiashok
Copy link
Copy Markdown
Contributor Author

kiashok commented Jul 26, 2023

@jterry75 @dmcgowan @mikebrow could you take a look when you have some time please?

akhilerm
akhilerm reviewed Jul 27, 2023
View reviewed changes
akhilerm
akhilerm reviewed Jul 27, 2023
View reviewed changes
mikebrow
mikebrow approved these changes Jul 27, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@kiashok
Copy link
Copy Markdown
Contributor Author

kiashok commented Jul 31, 2023

LGTM

Hi @mikebrow , could this PR be merged? There are two sign offs and no open questions. Thanks!

@kiashok
Copy link
Copy Markdown
Contributor Author

kiashok commented Aug 3, 2023

LGTM

Hi @mikebrow , could this PR be merged? There are two sign offs and no open questions. Thanks!

Hi @kevpar , could you please help merge this PR if everything looks good to you? Thanks!

@mikebrow mikebrow added the cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch label Aug 7, 2023
@mikebrow mikebrow merged commit 8559256 into containerd:release/1.6 Aug 7, 2023
@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Aug 7, 2023

@kiashok will you be preparing the cherry pick for 1.7

@kiashok
Copy link
Copy Markdown
Contributor Author

kiashok commented Aug 8, 2023

@kiashok will you be preparing the cherry pick for 1.7

Thanks for merging the PR @mikebrow . Yes I will be submitting changes for 1.7 as well (currently blocked by the discussion in this PR #8903 )

@kiashok kiashok mentioned this pull request Aug 9, 2023
Merged
aravindhp added a commit to openshift/containerd that referenced this pull request Aug 21, 2023
@aravindhp
Merge tag 'v1.6.23' into release-4.12
1a347cc 
containerd 1.6.23

Welcome to the v1.6.23 release of containerd!

The twenty-third patch release for containerd 1.6 contains various fixes and updates.

* **Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854))
* **cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927))
* **Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908))
* **update to go1.19.12 ([containerd#8905](containerd#8905))
* **backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888))

See the changelog for complete list of changes

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

* Kirtana Ashok
* Maksym Pavlenko
* Austin Vazquez
* Ben Foster
* Derek McGowan
* Mike Brown
* Phil Estes
* Rodrigo Campos
* Sebastiaan van Stijn
* Wei Fu

<details><summary>13 commits</summary>
<p>

* [release/1.6] Add release notes for v1.6.23 ([containerd#8939](containerd#8939))
  * [`e297a668f`](containerd@e297a66) Add release notes for v1.6.23
* [release/1.6] Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854))
  * [`f51bf1960`](containerd@f51bf19) Add support for stable ABI windows versions
  * [`43a02c0b2`](containerd@43a02c0) Update hcsshim tag to v0.9.10
*  [release/1.6] cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927))
  * [`cc5b0a21b`](containerd@cc5b0a2) cri: Don't use rel path for image volumes
* [release/1.6 backport] Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908))
  * [`4238cff1c`](containerd@4238cff) Upgrade GitHub actions packages in release workflow
* [release/1.6] update to go1.19.12 ([containerd#8905](containerd#8905))
  * [`00d1092b7`](containerd@00d1092) update to go1.19.12
* [release/1.6] backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888))
  * [`47d73b2de`](containerd@47d73b2) Fix ro mount option being passed
</p>
</details>

* **github.com/Microsoft/hcsshim**  v0.9.8 -> v0.9.10

Previous release can be found at [v1.6.22](https://github.com/containerd/containerd/releases/tag/v1.6.22)
aravindhp added a commit to openshift/containerd that referenced this pull request Aug 21, 2023
@aravindhp
Merge tag 'v1.6.23' into release-4.13
be7d468 
containerd 1.6.23

Welcome to the v1.6.23 release of containerd!

The twenty-third patch release for containerd 1.6 contains various fixes and updates.

* **Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854))
* **cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927))
* **Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908))
* **update to go1.19.12 ([containerd#8905](containerd#8905))
* **backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888))

See the changelog for complete list of changes

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

* Kirtana Ashok
* Maksym Pavlenko
* Austin Vazquez
* Ben Foster
* Derek McGowan
* Mike Brown
* Phil Estes
* Rodrigo Campos
* Sebastiaan van Stijn
* Wei Fu

<details><summary>13 commits</summary>
<p>

* [release/1.6] Add release notes for v1.6.23 ([containerd#8939](containerd#8939))
  * [`e297a668f`](containerd@e297a66) Add release notes for v1.6.23
* [release/1.6] Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854))
  * [`f51bf1960`](containerd@f51bf19) Add support for stable ABI windows versions
  * [`43a02c0b2`](containerd@43a02c0) Update hcsshim tag to v0.9.10
*  [release/1.6] cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927))
  * [`cc5b0a21b`](containerd@cc5b0a2) cri: Don't use rel path for image volumes
* [release/1.6 backport] Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908))
  * [`4238cff1c`](containerd@4238cff) Upgrade GitHub actions packages in release workflow
* [release/1.6] update to go1.19.12 ([containerd#8905](containerd#8905))
  * [`00d1092b7`](containerd@00d1092) update to go1.19.12
* [release/1.6] backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888))
  * [`47d73b2de`](containerd@47d73b2) Fix ro mount option being passed
</p>
</details>

* **github.com/Microsoft/hcsshim**  v0.9.8 -> v0.9.10

Previous release can be found at [v1.6.22](https://github.com/containerd/containerd/releases/tag/v1.6.22)
aravindhp added a commit to openshift/containerd that referenced this pull request Aug 21, 2023
@aravindhp
Merge tag 'v1.6.23' into release-4.11
6dbd1da 
containerd 1.6.23

Welcome to the v1.6.23 release of containerd!

The twenty-third patch release for containerd 1.6 contains various fixes and updates.

* **Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854))
* **cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927))
* **Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908))
* **update to go1.19.12 ([containerd#8905](containerd#8905))
* **backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888))

See the changelog for complete list of changes

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

* Kirtana Ashok
* Maksym Pavlenko
* Austin Vazquez
* Ben Foster
* Derek McGowan
* Mike Brown
* Phil Estes
* Rodrigo Campos
* Sebastiaan van Stijn
* Wei Fu

<details><summary>13 commits</summary>
<p>

* [release/1.6] Add release notes for v1.6.23 ([containerd#8939](containerd#8939))
  * [`e297a668f`](containerd@e297a66) Add release notes for v1.6.23
* [release/1.6] Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854))
  * [`f51bf1960`](containerd@f51bf19) Add support for stable ABI windows versions
  * [`43a02c0b2`](containerd@43a02c0) Update hcsshim tag to v0.9.10
*  [release/1.6] cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927))
  * [`cc5b0a21b`](containerd@cc5b0a2) cri: Don't use rel path for image volumes
* [release/1.6 backport] Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908))
  * [`4238cff1c`](containerd@4238cff) Upgrade GitHub actions packages in release workflow
* [release/1.6] update to go1.19.12 ([containerd#8905](containerd#8905))
  * [`00d1092b7`](containerd@00d1092) update to go1.19.12
* [release/1.6] backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888))
  * [`47d73b2de`](containerd@47d73b2) Fix ro mount option being passed
</p>
</details>

* **github.com/Microsoft/hcsshim**  v0.9.8 -> v0.9.10

Previous release can be found at [v1.6.22](https://github.com/containerd/containerd/releases/tag/v1.6.22)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akhilerm akhilerm akhilerm left review comments

@mikebrow mikebrow mikebrow approved these changes

@dcantah dcantah dcantah approved these changes

Assignees

No one assigned

Labels

cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@kiashok @k8s-ci-robot @mikebrow @dcantah @akhilerm