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

Upgrade opencontainers/runc (1.1.12) and controller-gen (0.14.0) #1562

Merged
merged 3 commits into from
Apr 7, 2024

Conversation

ppbits
Copy link
Contributor

@ppbits ppbits commented Apr 4, 2024

Ⅰ. Describe what this PR does

  1. Upgrades github.com/opencontainers/runc from 1.1.6 to 1.1.12 to fix CVE-2024-21626.
  2. Upgrades controller-gen from 0.11.0 to 0.14.0 to fix controller-gen panic issue.

Ⅱ. Does this pull request fix one issue?

NONE

Ⅲ. Describe how to verify it

No functionality changes.

Ⅳ. Special notes for reviews

@kruise-bot
Copy link

Welcome @ppbits! It looks like this is your first PR to openkruise/kruise 🎉

@ppbits ppbits changed the title Upgrade opencontainers/runc to 1.1.12 [WIP] Upgrade opencontainers/runc to 1.1.12 Apr 4, 2024
Copy link

codecov bot commented Apr 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 47.94%. Comparing base (ac3fa11) to head (59966b8).
Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1562   +/-   ##
=======================================
  Coverage   47.94%   47.94%           
=======================================
  Files         162      162           
  Lines       23491    23491           
=======================================
  Hits        11262    11262           
  Misses      11010    11010           
  Partials     1219     1219           
Flag Coverage Δ
unittests 47.94% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ppbits ppbits force-pushed the upgrade-runc-1.1.12 branch 3 times, most recently from 8fd5baf to 6287cf5 Compare April 4, 2024 18:10
Signed-off-by: ppbits <ppbits3@gmail.com>
Signed-off-by: ppbits <ppbits3@gmail.com>
Signed-off-by: ppbits <ppbits3@gmail.com>
@ppbits ppbits changed the title [WIP] Upgrade opencontainers/runc to 1.1.12 Upgrade opencontainers/runc (1.1.12) and controller-gen (0.14.0) Apr 4, 2024
@ppbits ppbits marked this pull request as ready for review April 4, 2024 19:09
@kruise-bot kruise-bot requested a review from FillZpp April 4, 2024 19:09
@ppbits
Copy link
Contributor Author

ppbits commented Apr 4, 2024

/assign @FillZpp

@zmberg
Copy link
Member

zmberg commented Apr 7, 2024

/lgtm

@zmberg
Copy link
Member

zmberg commented Apr 7, 2024

/approve

@kruise-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zmberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kruise-bot kruise-bot merged commit 0d0031a into openkruise:master Apr 7, 2024
34 checks passed
ABNER-1 pushed a commit to ABNER-1/kruise that referenced this pull request Apr 26, 2024
…nkruise#1562)

* Upgrade opencontainers/runc to 1.1.12

Signed-off-by: ppbits <ppbits3@gmail.com>

* keep using go 1.19

Signed-off-by: ppbits <ppbits3@gmail.com>

* revert change to config/manager/kustomization.yaml

Signed-off-by: ppbits <ppbits3@gmail.com>

---------

Signed-off-by: ppbits <ppbits3@gmail.com>
ABNER-1 pushed a commit to ABNER-1/kruise that referenced this pull request Apr 26, 2024
…nkruise#1562)

* Upgrade opencontainers/runc to 1.1.12

Signed-off-by: ppbits <ppbits3@gmail.com>

* keep using go 1.19

Signed-off-by: ppbits <ppbits3@gmail.com>

* revert change to config/manager/kustomization.yaml

Signed-off-by: ppbits <ppbits3@gmail.com>

---------

Signed-off-by: ppbits <ppbits3@gmail.com>
Signed-off-by: Abner-1 <Abner199709@gmail.com>
ABNER-1 pushed a commit to ABNER-1/kruise that referenced this pull request Apr 26, 2024
…nkruise#1562)

* Upgrade opencontainers/runc to 1.1.12

Signed-off-by: ppbits <ppbits3@gmail.com>

* keep using go 1.19

Signed-off-by: ppbits <ppbits3@gmail.com>

* revert change to config/manager/kustomization.yaml

Signed-off-by: ppbits <ppbits3@gmail.com>

---------

Signed-off-by: ppbits <ppbits3@gmail.com>
Signed-off-by: Abner-1 <Abner199709@gmail.com>
kruise-bot pushed a commit that referenced this pull request Apr 28, 2024
* cherry-pick 8f98ce chore: remove vendor

Signed-off-by: Abner-1 <Abner199709@gmail.com>

* Upgrade opencontainers/runc (1.1.12) and controller-gen (0.14.0) (#1562)

* Upgrade opencontainers/runc to 1.1.12

Signed-off-by: ppbits <ppbits3@gmail.com>

* keep using go 1.19

Signed-off-by: ppbits <ppbits3@gmail.com>

* revert change to config/manager/kustomization.yaml

Signed-off-by: ppbits <ppbits3@gmail.com>

---------

Signed-off-by: ppbits <ppbits3@gmail.com>
Signed-off-by: Abner-1 <Abner199709@gmail.com>

* add cri version notice in v1.6.0 changelog (#1569)

Signed-off-by: Abner-1 <Abner199709@gmail.com>

* update vuluerable package such as docker/sys/otelgrpc/k8s, delete containerd, add k8s replace 0.0.0 (#1586)

add docker unit test and ignore when docker socket not exist

Signed-off-by: Abner-1 <Abner199709@gmail.com>

* bump docker/docker,x/sys (#1591)

Signed-off-by: Abner-1 <Abner199709@gmail.com>

* add 1.6.3 cve-fix changelog (#1592)

Signed-off-by: Abner-1 <Abner199709@gmail.com>

* fix cherry-pick errors

Signed-off-by: Abner-1 <Abner199709@gmail.com>

* fix:setup-envtest ut err, ref: https://github.com/janus-idp/operator/pull/278/files (#1548)

Signed-off-by: jicheng.sk <jicheng.sk@alibaba-inc.com>
Signed-off-by: Abner-1 <Abner199709@gmail.com>

---------

Signed-off-by: Abner-1 <Abner199709@gmail.com>
Signed-off-by: ppbits <ppbits3@gmail.com>
Signed-off-by: jicheng.sk <jicheng.sk@alibaba-inc.com>
Co-authored-by: Lan <gcslyp@gmail.com>
Co-authored-by: Peng Peng <ppengdev@gmail.com>
Co-authored-by: KaiShi <BH4AWS@users.noreply.github.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.

Controller-gen panic when using go 1.22
4 participants