[fips] Agent reports FIPS status#2587
Merged
Merged
Conversation
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: Ying Li <ying.li@docker.com>
Codecov Report
@@ Coverage Diff @@
## master #2587 +/- ##
==========================================
- Coverage 61.38% 61.34% -0.04%
==========================================
Files 134 134
Lines 21736 21738 +2
==========================================
- Hits 13342 13335 -7
- Misses 6956 6977 +21
+ Partials 1438 1426 -12 |
Collaborator
|
LGTM |
| CertIssuerPublicKey: issuer.PublicKey, | ||
| CertIssuerSubject: issuer.Subject, | ||
| }, | ||
| FIPS: n.config.FIPS, |
Contributor
There was a problem hiding this comment.
While this doesn't really affect this PR, I'd like for us to make sure that users know to set this in the node config.
Contributor
Author
There was a problem hiding this comment.
@nishanttotla I agree - where would you suggest this be documented?
Contributor
There was a problem hiding this comment.
@cyli I'm not sure, but let me look this up. My hunch is that this would go into the Docker API documentation. cc @thaJeztah
Member
There was a problem hiding this comment.
Trying to grasp where / when it needs to be set; @cyli @nishanttotla feel free to ping me on Slack / drop by my desk to explain 😅
nishanttotla
approved these changes
Apr 10, 2018
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Apr 17, 2018
Relevant changes: - moby/swarmkit#2551 RoleManager will remove deleted nodes from the cluster membership - moby/swarmkit#2574 Scheduler/TaskReaper: handle unassigned tasks marked for shutdown - moby/swarmkit#2561 Avoid predefined error log - moby/swarmkit#2557 Task reaper should delete tasks with removed slots that were not yet assigned - moby/swarmkit#2587 [fips] Agent reports FIPS status - moby/swarmkit#2603 Fix manager/state/store.timedMutex Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Apr 18, 2018
Relevant changes: - moby/swarmkit#2551 RoleManager will remove deleted nodes from the cluster membership - moby/swarmkit#2574 Scheduler/TaskReaper: handle unassigned tasks marked for shutdown - moby/swarmkit#2561 Avoid predefined error log - moby/swarmkit#2557 Task reaper should delete tasks with removed slots that were not yet assigned - moby/swarmkit#2587 [fips] Agent reports FIPS status - moby/swarmkit#2603 Fix manager/state/store.timedMutex Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 333b2f28fef4ba857905e7263e7b9bbbf7c522fc Component: engine
thaJeztah
added a commit
to thaJeztah/docker-ce
that referenced
this pull request
Apr 19, 2018
Relevant changes: - moby/swarmkit#2551 RoleManager will remove deleted nodes from the cluster membership - moby/swarmkit#2574 Scheduler/TaskReaper: handle unassigned tasks marked for shutdown - moby/swarmkit#2561 Avoid predefined error log - moby/swarmkit#2557 Task reaper should delete tasks with removed slots that were not yet assigned - moby/swarmkit#2587 [fips] Agent reports FIPS status - moby/swarmkit#2603 Fix manager/state/store.timedMutex Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 333b2f28fef4ba857905e7263e7b9bbbf7c522fc) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
The agent will now report a node's FIPS status as part of the node description.
This is not based on #2562, but it will conflict with it, since this adds the node config FIPs bool in order to propagate it to the agent.