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.

Sign up for GitHub

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

Jump to bottom

fix(sec): get rid of dependency on containerd (backport of #7387) #7389

Merged
merged 5 commits into from
Aug 2, 2023
Merged

fix(sec): get rid of dependency on containerd (backport of #7387) #7389

merged 5 commits into from
Aug 2, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Jul 31, 2023

Automatic cherry-pick of #7387 for branch release-2.0

Generated by action

cherry-picked commit 490549e
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.0
Your branch is up to date with 'origin/release-2.0'.

You are currently cherry-picking commit 490549efb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   app/kuma-dp/pkg/dataplane/cgroups/cgroups.go
	modified:   app/kuma-dp/pkg/dataplane/envoy/memory_limit_linux.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

@slonka @kumahq
fix(sec): get rid of dependency on containerd (#7387)
896be87 
Containerd shows up time and time again with a CVE that does not actually impact our codebase but looks not great in scan results. I copied the code from the source so we no longer rely on it.

Signed-off-by: slonka <slonka@users.noreply.github.com>
@slonka
fix(sec): resolve confcits
43e993f 
Signed-off-by: slonka <slonka@users.noreply.github.com>
@slonka slonka removed the conflict label Jul 31, 2023
slonka and others added 3 commits July 31, 2023 13:29
@slonka
chore(lint): change indent
f876298 
Signed-off-by: slonka <slonka@users.noreply.github.com>
@michaelbeaumont
Merge remote-tracking branch 'upstream/release-2.0' into chore/backpo…
d0d6082 
…rt-release-2.0-7387

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont
chore: upgrade testcontainers-go
7b23be0 
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont enabled auto-merge (squash) August 2, 2023 15:27
@michaelbeaumont michaelbeaumont merged commit ffae6c2 into release-2.0 Aug 2, 2023
@michaelbeaumont michaelbeaumont deleted the chore/backport-release-2.0-7387 branch August 2, 2023 18:14
michaelbeaumont added a commit to michaelbeaumont/kuma that referenced this pull request Aug 3, 2023
@michaelbeaumont
Revert "fix(sec): get rid of dependency on containerd (backport of ku…
e4b3842 
…mahq#7387) (kumahq#7389)"

This reverts commit ffae6c2.
michaelbeaumont added a commit that referenced this pull request Aug 3, 2023
@michaelbeaumont
Revert "fix(sec): get rid of dependency on containerd (backport of #7387
b1ea688 
) (#7389)"

This reverts commit ffae6c2.

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
michaelbeaumont added a commit that referenced this pull request Aug 3, 2023
@michaelbeaumont
build(go.mod): revert containerd changes (#7437)
8e64641 
* Revert "fix(containerd): only build cgroups on linux (backport of #7408) (#7423)"
This reverts commit e2af55b.
* Revert "fix(sec): get rid of dependency on containerd (backport of #7387) (#7389)"
This reverts commit ffae6c2.

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelbeaumont michaelbeaumont michaelbeaumont approved these changes

Assignees
No one assigned
Labels
release-2.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@michaelbeaumont @slonka