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) #7392

Merged
merged 4 commits into from
Jul 31, 2023
Merged

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

merged 4 commits into from
Jul 31, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Jul 31, 2023

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

Generated by action

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

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

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)
f726a83 
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
45766d5 
Signed-off-by: slonka <slonka@users.noreply.github.com>
@slonka
Copy link
Contributor

slonka commented Jul 31, 2023

/format

@slonka slonka removed the conflict label Jul 31, 2023
slonka added 2 commits July 31, 2023 11:05
@slonka
chore(lint): make check pass
4947d73 
Signed-off-by: slonka <slonka@users.noreply.github.com>
@slonka
chore(lint): change indent
27e52d2 
Signed-off-by: slonka <slonka@users.noreply.github.com>
@slonka slonka merged commit 2fd5084 into release-2.3 Jul 31, 2023
@slonka slonka deleted the chore/backport-release-2.3-7387 branch July 31, 2023 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slonka slonka slonka approved these changes

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

Successfully merging this pull request may close these issues.
1 participant
@slonka