Support force clean finalizer in networkchaos/netem #415
Conversation
yujunz
force-pushed
the
force-cleanup
branch
2 times, most recently
from
f99dbe5
to
d62b147
Compare
controllers/common/types.go
Outdated
| @@ -29,6 +29,13 @@ import ( | |||
| "sigs.k8s.io/controller-runtime/pkg/client" | |||
| ) | |||
|
|
|||
| const ( | |||
| // AnnotationCleanFinalizer key | |||
| AnnotationCleanFinalizer = `cleanFinalizer` | |||
There was a problem hiding this comment.
We may need a common prefix for chaos-mesh annotations. @cwen0
yujunz
changed the title
|
|
||
| 1. Run `setup.sh` to simulate a condition of unable to clean finalizers. | ||
| 2. Press `Ctrl + C` to break | ||
| 3. Run `test.sh` to annotate chaos resource and force cleaning finalizers. |
There was a problem hiding this comment.
I suggest demonstrating the detailed operation for force cleanup instead of executing a script. That would be much helpful for users.
There was a problem hiding this comment.
I wrote the example as an e2e test, not user oriented feature demonstration.
controllers/common/types.go
Outdated
| @@ -29,6 +29,13 @@ import ( | |||
| "sigs.k8s.io/controller-runtime/pkg/client" | |||
| ) | |||
|
|
|||
| const ( | |||
| // AnnotationCleanFinalizer key | |||
| AnnotationCleanFinalizer = `chaos-mesh/cleanFinalizer` | |||
There was a problem hiding this comment.
It seems we should define the annotation key prefix for chaos-mesh. What about chaosmesh.pingcap.com/ @zhouqiang-cl @cwen0
| } | ||
|
|
||
| networkchaos.Finalizers = utils.RemoveFromFinalizer(networkchaos.Finalizers, key) | ||
| } | ||
|
|
||
| return nil | ||
| if networkchaos.Annotations[common.AnnotationCleanFinalizer] == common.AnnotationCleanFinalizerForced { | ||
| r.Log.Info("Force cleanup all finalizers") |
There was a problem hiding this comment.
Please add the target chaos object name/namespace/type in the log.
yujunz
changed the title
yujunz
changed the title
|
/run-e2e-test |
|
@Yisaer PTAL |
|
/merge |
|
/run-all-tests |
|
@yujunz merge failed. |
|
/merge |
|
/run-all-tests |
|
@yujunz merge failed. |
|
/run-e2e-test |
|
/merge |
|
/run-all-tests |
|
@yujunz merge failed. |
|
I don't know why merge failed after 2 minutes. But all tests are passed. I will merge it now. |
* Support force cleanup in networkchaos * Add example of force clean finalizer * Amend according to review comments Co-authored-by: pingcap-github-bot <sre-bot@pingcap.com>
What problem does this PR solve?
#227
What is changed and how does it work?
Force clean finalizer
Check List
Tests
examples/clean-finalizer)Code changes
Does this PR introduce a user-facing change?: