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

use helm values to set chaos-daemon capabilities #4030

Merged
merged 3 commits into from
May 8, 2023
Merged

use helm values to set chaos-daemon capabilities #4030

merged 3 commits into from
May 8, 2023

Conversation

nioshield
Copy link
Contributor

What problem does this PR solve?

Flexible configuration of capabilities is expected in some test scenarios

What's changed and how it works?

Replace the chaos-daemon-daemonset.yaml capabilities configuration with template variables

Related changes

fixes #3917

  • This change also requires further updates to the website (e.g. docs)
  • This change also requires further updates to the UI interface
  • Need to cheery-pick to release branches
    • release-2.5
    • release-2.4

Checklist

CHANGELOG

  • I have updated the CHANGELOG.md
  • I have labeled this PR with "no-need-update-changelog"

Tests

  • Unit test
  • E2E test
  • No code
  • Manual test (add steps below)

Side effects

  • Breaking backward compatibility

DCO

If you find the DCO check fails, please run commands like below (Depends on the actual situations. For example, if the failed commit isn't the most recent) to fix it:

git commit --amend --signoff
git push --force

Signed-off-by: nio <nioshield@gmail.com>
@cwen0
Copy link
Member

cwen0 commented May 2, 2023

@nioshield Thanks for your contribution! This pr can't fix #3917, but is is useful. We can merge it.

capabilities:
add:
- SYS_PTRACE
- NET_ADMIN
Copy link
Member

Choose a reason for hiding this comment

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

maybe we should append NET_RAW here? also cc @dsharp-pivotal

ref: #3917 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think so. Let me add it

Copy link
Member

@STRRL STRRL left a comment

Choose a reason for hiding this comment

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

rest LGTM

@STRRL STRRL merged commit 9c55ffd into chaos-mesh:master May 8, 2023
55 of 56 checks passed
@STRRL
Copy link
Member

STRRL commented May 9, 2023

/cherrypick release-2.5

@chaos-mesh-cherrypick-robot

@STRRL: #4030 failed to apply on top of branch "release-2.5":

Applying: use helm values to set chaos-daemon capabilities
Using index info to reconstruct a base tree...
M	CHANGELOG.md
M	helm/chaos-mesh/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging helm/chaos-mesh/values.yaml
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 use helm values to set chaos-daemon capabilities
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-2.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Chaos daemon requires NET_RAW capability on OpenShift
4 participants