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

bump docker/docker,x/sys #1591

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Conversation

ABNER-1
Copy link
Member

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

Ⅰ. Describe what this PR does

bump github.com/docker/docker v26.0.1 -> v26.0.2
replace golang.org/x/sys -> v0.19.0

fix “Incorrect conversion between integer types

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how to verify it

Ⅳ. Special notes for reviews

@kruise-bot kruise-bot added the size/M size/M: 30-99 label Apr 24, 2024
Copy link

codecov bot commented Apr 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.35%. Comparing base (0d0031a) to head (312be17).
Report is 21 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1591      +/-   ##
==========================================
+ Coverage   47.91%   49.35%   +1.43%     
==========================================
  Files         162      161       -1     
  Lines       23491    18635    -4856     
==========================================
- Hits        11256     9197    -2059     
+ Misses      11014     8214    -2800     
- Partials     1221     1224       +3     
Flag Coverage Δ
unittests 49.35% <ø> (+1.43%) ⬆️

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.

Copy link
Member

@furykerry furykerry left a comment

Choose a reason for hiding this comment

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

/lgtm
/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 2c4261c into openkruise:master Apr 24, 2024
34 checks passed
ABNER-1 added a commit to ABNER-1/kruise that referenced this pull request Apr 26, 2024
ABNER-1 added a commit to ABNER-1/kruise that referenced this pull request Apr 26, 2024
ABNER-1 added a commit to ABNER-1/kruise that referenced this pull request Apr 26, 2024
kruise-bot pushed a commit that referenced this pull request Apr 28, 2024
* cherry-pick 8f98ce chore: remove vendor

Signed-off-by: Abner-1 <[email protected]>

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

* Upgrade opencontainers/runc to 1.1.12

Signed-off-by: ppbits <[email protected]>

* keep using go 1.19

Signed-off-by: ppbits <[email protected]>

* revert change to config/manager/kustomization.yaml

Signed-off-by: ppbits <[email protected]>

---------

Signed-off-by: ppbits <[email protected]>
Signed-off-by: Abner-1 <[email protected]>

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

Signed-off-by: Abner-1 <[email protected]>

* 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 <[email protected]>

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

Signed-off-by: Abner-1 <[email protected]>

* add 1.6.3 cve-fix changelog (#1592)

Signed-off-by: Abner-1 <[email protected]>

* fix cherry-pick errors

Signed-off-by: Abner-1 <[email protected]>

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

Signed-off-by: jicheng.sk <[email protected]>
Signed-off-by: Abner-1 <[email protected]>

---------

Signed-off-by: Abner-1 <[email protected]>
Signed-off-by: ppbits <[email protected]>
Signed-off-by: jicheng.sk <[email protected]>
Co-authored-by: Lan <[email protected]>
Co-authored-by: Peng Peng <[email protected]>
Co-authored-by: KaiShi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants