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

update vuluerable package #1586

Merged
merged 1 commit into from
Apr 22, 2024

Conversation

ABNER-1
Copy link
Contributor

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

Ⅰ. Describe what this PR does

update vuluerable package such as docker/sys/otelgrpc/k8s, delete containerd

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how to verify it

Ⅳ. Special notes for reviews

@ABNER-1 ABNER-1 force-pushed the update-vuluerable-package branch 6 times, most recently from d892392 to b34cb41 Compare April 18, 2024 12:32
Copy link

codecov bot commented Apr 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.37%. Comparing base (0d0031a) to head (ca62e04).
Report is 16 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1586      +/-   ##
==========================================
+ Coverage   47.91%   49.37%   +1.46%     
==========================================
  Files         162      161       -1     
  Lines       23491    18623    -4868     
==========================================
- Hits        11256     9196    -2060     
+ Misses      11014     8205    -2809     
- Partials     1221     1222       +1     
Flag Coverage Δ
unittests 49.37% <100.00%> (+1.46%) ⬆️

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.

@ABNER-1 ABNER-1 force-pushed the update-vuluerable-package branch 3 times, most recently from ed3987f to b4e048a Compare April 19, 2024 05:37
…tainerd, add k8s replace 0.0.0

add docker unit test and ignore when docker socket not exist

Signed-off-by: Abner-1 <Abner199709@gmail.com>
@furykerry
Copy link
Member

/lgtm

@furykerry
Copy link
Member

/approve

@kruise-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: furykerry

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 2aea715 into openkruise:master Apr 22, 2024
34 checks passed
ABNER-1 added a commit to ABNER-1/kruise that referenced this pull request Apr 26, 2024
…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>
ABNER-1 added a commit to ABNER-1/kruise that referenced this pull request Apr 26, 2024
…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>
ABNER-1 added a commit to ABNER-1/kruise that referenced this pull request Apr 26, 2024
…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>
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.

None yet

3 participants