Shutdown agent when it is banned #3308
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: Marcos Yacob <[email protected]>
MarcosDY
requested review from
evan2645,
amartinezfayo,
azdagron and
rturner3
as code owners
pkg/common/nodeutil/node.go
Outdated
| return isExpectedPermissionDenied(err, shouldReattest) | ||
| } | ||
|
|
||
| // ShouldAgentShutdown returns true if the Server returned an error worth shutdowning the Agent |
There was a problem hiding this comment.
Suggested change
| // ShouldAgentShutdown returns true if the Server returned an error worth shutdowning the Agent | |
| // ShouldAgentShutdown returns true if the Server returned an error worth shutting down the Agent |
pkg/agent/svid/rotator_test.go
Outdated
| func TestRotationFails(t *testing.T) { | ||
| caCert, caKey := testca.CreateCACertificate(t, nil, nil) | ||
|
|
||
| expiredStatus := status.New(codes.PermissionDenied, "agent is expired") |
There was a problem hiding this comment.
nit:
Even if it's a test, it may be confusing
Suggested change
| expiredStatus := status.New(codes.PermissionDenied, "agent is expired") | |
| expiredStatus := status.New(codes.PermissionDenied, "agent is not active") |
| /opt/spire/bin/spire-server agent evict \ | ||
| -spiffeID "spiffe://domain.test/spire/agent/x509pop/$(fingerprint conf/agent/agent.crt.pem)" | ||
|
|
||
| # Check at most 30 times (with one second in between) than agent is going shutdown |
There was a problem hiding this comment.
Suggested change
| # Check at most 30 times (with one second in between) than agent is going shutdown | |
| # Check at most 30 times (with one second in between) that the agent is going to shut down |
| sleep "${CHECKINTERVAL}" | ||
| done | ||
|
|
||
| fail-now "timed out waiting for agent to sync down entry" |
There was a problem hiding this comment.
Suggested change
| fail-now "timed out waiting for agent to sync down entry" | |
| fail-now "timed out waiting for agent to shut down" |
| MAXCHECKS=30 | ||
| CHECKINTERVAL=1 | ||
| for ((i=1;i<=MAXCHECKS;i++)); do | ||
| log-info "checking agent is not able to start ($i of $MAXCHECKS max)..." |
There was a problem hiding this comment.
Suggested change
| log-info "checking agent is not able to start ($i of $MAXCHECKS max)..." | |
| log-info "checking that the agent is not able to start ($i of $MAXCHECKS max)..." |
Signed-off-by: Marcos Yacob <[email protected]>
stevend-uber
pushed a commit
to stevend-uber/spire
that referenced
this pull request
Oct 16, 2023
Shut down agent when it is banned Signed-off-by: Marcos Yacob <[email protected]>
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.
Make Agent shutdown when it is banned
Which issue this PR fixes
fixes #3278