fix(executor): Fix emissary kill. Fixes #6030 #6084
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Alex Collins <alex_collins@intuit.com>
alexec
commented
Jun 3, 2021
| func SignalContainer(restConfig *rest.Config, namespace string, pod string, container string, s syscall.Signal) error { | ||
| return ExecPodContainerAndGetOutput(restConfig, namespace, pod, container, "/bin/sh", "-c", fmt.Sprintf("kill -s%d -- -1", s)) | ||
| func SignalContainer(restConfig *rest.Config, pod *corev1.Pod, container string, s syscall.Signal) error { | ||
| command := []string{"/bin/sh", "-c", "kill -%d 1"} |
There was a problem hiding this comment.
this line changes the default kill cmd
alexec
commented
Jun 3, 2021
| @@ -20,6 +38,13 @@ func ExecPodContainerAndGetOutput(restConfig *rest.Config, namespace string, pod | |||
| return err | |||
| } | |||
| stdout, stderr, err := common.GetExecutorOutput(x) | |||
| log.WithFields(log.Fields{"stdout": stdout, "stderr": stderr}).WithError(err).Debug() | |||
| log. | |||
Codecov Report
@@ Coverage Diff @@
## master #6084 +/- ##
==========================================
+ Coverage 47.70% 47.75% +0.04%
==========================================
Files 249 249
Lines 15739 15740 +1
==========================================
+ Hits 7509 7516 +7
+ Misses 7287 7284 -3
+ Partials 943 940 -3
Continue to review full report at Codecov.
|
|
@whynowy please review? |
|
Does it fix the issue #6030? It looks like the user says it's still not working. |
|
@rwong2888 is using an RC with does not have this fix on it. |
whynowy
approved these changes
Jun 8, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Alex Collins alex_collins@intuit.com
Fixes #6030