Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[release/0.12] Backport commits from hcsshim/main to update module versions #2237

Merged
merged 7 commits into from
Aug 19, 2024

Conversation

kiashok
Copy link
Contributor

@kiashok kiashok commented Aug 16, 2024

This PR backports few commits needed to update some important module versions in release/0.12 branch:

  1. All commits from Bump opa/containerd to latest versions #2235 in main branch to release/0.12 branch

a) 9b0599b 9b0599b

The above commit was manually applied due to merge conflicts

b) 56e8cf9
56e8cf9

This commit was a direct backport + changes to fix lint errors.

c) 0084749 0084749

This commit was a direct backport

  1. Following commits from main branch were backported to release/0.12 branch. Conflicts were resolved.

#2166
#2039
#2225
#2051

  1. Additional manual commit to update few other module versions.

@kiashok kiashok requested a review from a team as a code owner August 16, 2024 18:35
@kiashok
Copy link
Contributor Author

kiashok commented Aug 16, 2024

cc @dims

@kiashok kiashok force-pushed the backport-tag-updates branch 4 times, most recently from 8fea676 to 46b1db4 Compare August 16, 2024 22:07
helsaawy and others added 7 commits August 16, 2024 15:53
Dependebot PRs:

 - hcsshim/2140
 - hcsshim/2145
 - hcsshim/2146
 - hcsshim/2149
 - hcsshim/2153
 - hcsshim/2154
 - hcsshim/2159
 - hcsshim/2161
 - hcsshim/2174
 - hcsshim/2175
 - hcsshim/2176

Update protobuf files.

`google.golang.org/grpc v1.64.0` deprecated `Dial[Context]` and
`WithBlock`.
Replacing either is non-trivial, and left for a future PR.

Update dependabot file to ignore patch updates: they rarely provide bug
fixes and increase repo churn.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 75428d1)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
* [deps] Omni-bus dependency update

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* upgrade containerd to see if tests pass

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

---------

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 8039310)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

.

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
CVE alerts:

 - https://github.com/microsoft/hcsshim/security/dependabot/108
 - https://github.com/microsoft/hcsshim/security/dependabot/107

Dependabot PRs:

 - 2224
 - 2223
 - 2219
 - 2218
 - 2213

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit a8ef0c4)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
(cherry picked from commit 88ac0d9)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
(cherry picked from commit 56e8cf9)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
Consolidate dependabot updates:
 - github.com/microsoft/pull/2050
 - github.com/microsoft/pull/2048
 - github.com/microsoft/pull/2047
 - github.com/microsoft/pull/2046
 - github.com/microsoft/pull/2045
 - github.com/microsoft/pull/2044
 - github.com/microsoft/pull/2043
 - github.com/microsoft/pull/2042

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 060de7c)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
@kiashok kiashok changed the title [release/0.12] Bump opa/containerd to latest versions [release/0.12] Backport commits from hcsshim/main to update module versions Aug 19, 2024
Copy link
Contributor

@dims dims left a comment

Choose a reason for hiding this comment

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

this has both the containerd/cotnainerd-api gomod update and the opa one as well

thanks!

@kiashok kiashok merged commit f922f2a into microsoft:release/0.12 Aug 19, 2024
30 checks passed
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants