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

cherry-pick 1.6.3 commits #1595

Merged
merged 8 commits into from
Apr 28, 2024
Merged

Conversation

ABNER-1
Copy link
Contributor

@ABNER-1 ABNER-1 commented Apr 26, 2024

Ⅰ. Describe what this PR does

cherry-pick 1.6.3 commits
fix potential security issues of dependent packages (#1586, ABNER-1) (#1591, ABNER-1)

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how to verify it

Ⅳ. Special notes for reviews

liangyuanpeng and others added 8 commits April 26, 2024 13:58
Signed-off-by: Abner-1 <Abner199709@gmail.com>
…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>
Signed-off-by: Abner-1 <Abner199709@gmail.com>
…tainerd, add k8s replace 0.0.0 (openkruise#1586)

add docker unit test and ignore when docker socket not exist

Signed-off-by: Abner-1 <Abner199709@gmail.com>
Signed-off-by: Abner-1 <Abner199709@gmail.com>
Signed-off-by: Abner-1 <Abner199709@gmail.com>
Signed-off-by: Abner-1 <Abner199709@gmail.com>
…pull/278/files (openkruise#1548)

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

zmberg commented Apr 28, 2024

/lgtm
/approve

@zmberg
Copy link
Member

zmberg commented Apr 28, 2024

/approve

@furykerry
Copy link
Member

/lgtm
/approve

@kruise-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: furykerry, 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 1c07d4d into openkruise:release-1.6 Apr 28, 2024
30 checks passed
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.

None yet

7 participants