Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1c07d4d

Browse files
ABNER-1liangyuanpengppbitsBH4AWS
authoredApr 28, 2024··
cherry-pick 1.6.3 commits (#1595)
* 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>
1 parent 99ca57c commit 1c07d4d

File tree

7,348 files changed

+2885
-2068349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,348 files changed

+2885
-2068349
lines changed
 

‎apis/apps/v1beta1/zz_generated.deepcopy.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/policy/v1alpha1/zz_generated.deepcopy.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Please sign in to comment.