Merge pull request #34123 from twistlock/plugable_secrets_backend

pluggable secret backend
moby · Jul 17, 2017 · 08f7cf0 · 08f7cf0
2 parents 458f671 + 7d45caf
commit 08f7cf0
Show file tree

Hide file tree

Showing 14 changed files with 344 additions and 144 deletions.
diff --git a/api/types/swarm/secret.go b/api/types/swarm/secret.go
@@ -12,7 +12,8 @@ type Secret struct {
 // SecretSpec represents a secret specification from a secret in swarm
 type SecretSpec struct {
 	Annotations
-	Data []byte `json:",omitempty"`
+	Data   []byte  `json:",omitempty"`
+	Driver *Driver `json:"omitempty"` // name of the secrets driver used to fetch the secret's value from an external secret store
 }
 
 // SecretReferenceFileTarget is a file target in a secret reference

diff --git a/daemon/cluster/convert/secret.go b/daemon/cluster/convert/secret.go
@@ -13,6 +13,7 @@ func SecretFromGRPC(s *swarmapi.Secret) swarmtypes.Secret {
 		Spec: swarmtypes.SecretSpec{
 			Annotations: annotationsFromGRPC(s.Spec.Annotations),
 			Data:        s.Spec.Data,
+			Driver:      driverFromGRPC(s.Spec.Driver),
 		},
 	}
 
@@ -31,7 +32,8 @@ func SecretSpecToGRPC(s swarmtypes.SecretSpec) swarmapi.SecretSpec {
 			Name:   s.Name,
 			Labels: s.Labels,
 		},
-		Data: s.Data,
+		Data:   s.Data,
+		Driver: driverToGRPC(s.Driver),
 	}
 }
 

diff --git a/vendor.conf b/vendor.conf
@@ -106,7 +106,7 @@ github.com/stevvooe/continuity cd7a8e21e2b6f84799f5dd4b65faf49c8d3ee02d
 github.com/tonistiigi/fsutil 0ac4c11b053b9c5c7c47558f81f96c7100ce50fb
 
 # cluster
-github.com/docker/swarmkit a3d96fe13e30e46c3d4cfc3f316ebdd8446a079d
+github.com/docker/swarmkit 3e2dd3c0a76149b1620b42d28dd6ff48270404e5
 github.com/gogo/protobuf v0.4
 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a
 github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e

diff --git a/vendor/github.com/docker/swarmkit/api/specs.pb.go b/vendor/github.com/docker/swarmkit/api/specs.pb.go
diff --git a/vendor/github.com/docker/swarmkit/api/specs.proto b/vendor/github.com/docker/swarmkit/api/specs.proto
diff --git a/vendor/github.com/docker/swarmkit/api/validation/secrets.go b/vendor/github.com/docker/swarmkit/api/validation/secrets.go
diff --git a/vendor/github.com/docker/swarmkit/manager/controlapi/secret.go b/vendor/github.com/docker/swarmkit/manager/controlapi/secret.go
diff --git a/vendor/github.com/docker/swarmkit/manager/controlapi/server.go b/vendor/github.com/docker/swarmkit/manager/controlapi/server.go
diff --git a/vendor/github.com/docker/swarmkit/manager/dispatcher/assignments.go b/vendor/github.com/docker/swarmkit/manager/dispatcher/assignments.go
diff --git a/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go b/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go
diff --git a/vendor/github.com/docker/swarmkit/manager/drivers/provider.go b/vendor/github.com/docker/swarmkit/manager/drivers/provider.go
diff --git a/vendor/github.com/docker/swarmkit/manager/drivers/secrets.go b/vendor/github.com/docker/swarmkit/manager/drivers/secrets.go
diff --git a/vendor/github.com/docker/swarmkit/manager/manager.go b/vendor/github.com/docker/swarmkit/manager/manager.go
diff --git a/vendor/github.com/docker/swarmkit/manager/scheduler/decision_tree.go b/vendor/github.com/docker/swarmkit/manager/scheduler/decision_tree.go