Skip to content

Add FIPS types to the moby types #36893

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.

Sign up for GitHub

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

Closed
cyli wants to merge 2 commits into from
Closed

Add FIPS types to the moby types #36893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a811f93
Include the FIPS mode of the node in the node description.
cyli Apr 18, 2018
5629e0b
Add a boolean indicating whether a swarm cluster mandates that all no…
cyli Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions api/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2068,6 +2068,11 @@ definitions:
$ref: "#/definitions/EngineDescription"
TLSInfo:
$ref: "#/definitions/TLSInfo"
FIPS:
type: "boolean"
example: true
default: false
description: Indicates whether the node is running in FIPS mode

Platform:
description: |
Expand Down Expand Up @@ -2416,6 +2421,12 @@ definitions:
description: "Whether there is currently a root CA rotation in progress for the swarm"
type: "boolean"
example: false
default: false
MandatoryFips:
description: "Whether this cluster requires that all nodes be in FIPS mode"
type: "boolean"
example: true
default: false

JoinTokens:
description: |
Expand Down
1 change: 1 addition & 0 deletions api/types/swarm/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ type NodeDescription struct {
Resources Resources `json:",omitempty"`
Engine EngineDescription `json:",omitempty"`
TLSInfo TLSInfo `json:",omitempty"`
FIPS bool `json:",omitempty"`
}

// Platform represents the platform (Arch/OS).
Expand Down
1 change: 1 addition & 0 deletions api/types/swarm/swarm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ type ClusterInfo struct {
Spec Spec
TLSInfo TLSInfo
RootRotationInProgress bool
MandatoryFIPS bool
}

// Swarm represents a swarm.
Expand Down
1 change: 1 addition & 0 deletions daemon/cluster/convert/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ func NodeFromGRPC(n swarmapi.Node) types.Node {
//Description
if n.Description != nil {
node.Description.Hostname = n.Description.Hostname
node.Description.FIPS = n.Description.FIPS
if n.Description.Platform != nil {
node.Description.Platform.Architecture = n.Description.Platform.Architecture
node.Description.Platform.OS = n.Description.Platform.OS
Expand Down