Merge pull request #2771 from dperny/gmsa-support-with-secretreference

Allow using Configs as CredentialSpecs
moby · Jan 17, 2019 · 0503e17 · 0503e17
2 parents 47b1cd4 + be26111
commit 0503e17
Show file tree

Hide file tree

Showing 6 changed files with 773 additions and 361 deletions.
diff --git a/api/api.pb.txt b/api/api.pb.txt
@@ -3834,6 +3834,9 @@ file {
       json_name: "mode"
     }
   }
+  message_type {
+    name: "RuntimeTarget"
+  }
   message_type {
     name: "SecretReference"
     field {
@@ -3888,6 +3891,15 @@ file {
       oneof_index: 0
       json_name: "file"
     }
+    field {
+      name: "runtime"
+      number: 4
+      label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".docker.swarmkit.v1.RuntimeTarget"
+      oneof_index: 0
+      json_name: "runtime"
+    }
     oneof_decl {
       name: "target"
     }
@@ -4065,6 +4077,14 @@ file {
         oneof_index: 0
         json_name: "registry"
       }
+      field {
+        name: "Config"
+        number: 3
+        label: LABEL_OPTIONAL
+        type: TYPE_STRING
+        oneof_index: 0
+        json_name: "Config"
+      }
       oneof_decl {
         name: "source"
       }

diff --git a/api/ca.pb.go b/api/ca.pb.go