Merge pull request #32409 from dnephin/support-consistency-params-in-compose

Add support for volume consistency in compose format

cli/compose/convert/volume.go

@@ -28,10 +28,11 @@ func convertVolumeToMount(
 	namespace Namespace,
 ) (mount.Mount, error) {
 	result := mount.Mount{
-		Type:     mount.Type(volume.Type),
+		Type:        mount.Type(volume.Type),
-		Source:   volume.Source,
+		Source:      volume.Source,
-		Target:   volume.Target,
+		Target:      volume.Target,
-		ReadOnly: volume.ReadOnly,
+		ReadOnly:    volume.ReadOnly,
+		Consistency: mount.Consistency(volume.Consistency),
 	}
 
 	// Anonymous volumes

cli/compose/loader/full-example.yml

@@ -220,6 +220,10 @@ services:
       - ~/configs:/etc/configs/:ro
       # Named volume
       - datavolume:/var/lib/mysql
+      - type: bind
+        source: ./opt
+        target: /opt
+        consistency: cached
 
     working_dir: /code
 

cli/compose/loader/loader_test.go

@@ -910,6 +910,7 @@ func TestFullExample(t *testing.T) {
 			{Source: workingDir + "/static", Target: "/var/www/html", Type: "bind"},
 			{Source: homeDir + "/configs", Target: "/etc/configs/", Type: "bind", ReadOnly: true},
 			{Source: "datavolume", Target: "/var/lib/mysql", Type: "volume"},
+			{Source: workingDir + "/opt", Target: "/opt", Consistency: "cached", Type: "bind"},
 		},
 		WorkingDir: "/code",
 	}

cli/compose/schema/data/config_schema_v3.2.json

@@ -249,6 +249,7 @@
                   "source": {"type": "string"},
                   "target": {"type": "string"},
                   "read_only": {"type": "boolean"},
+                  "consistency": {"type": "string"},
                   "bind": {
                     "type": "object",
                     "properties": {

cli/compose/types/types.go

@@ -229,12 +229,13 @@ type ServicePortConfig struct {
 
 // ServiceVolumeConfig are references to a volume used by a service
 type ServiceVolumeConfig struct {
-	Type     string
+	Type        string
-	Source   string
+	Source      string
-	Target   string
+	Target      string
-	ReadOnly bool `mapstructure:"read_only"`
+	ReadOnly    bool `mapstructure:"read_only"`
-	Bind     *ServiceVolumeBind
+	Consistency string
-	Volume   *ServiceVolumeVolume
+	Bind        *ServiceVolumeBind
+	Volume      *ServiceVolumeVolume
 }
 
 // ServiceVolumeBind are options for a service volume of type bind