Merge pull request #528 from q384566678/generate-windows

generate: windows-specific container configuration generate

Author: liangchenye

cmd/oci-runtime-tool/generate.go

@@ -123,6 +123,14 @@ var generateFlags = []cli.Flag{
 	cli.StringFlag{Name: "solaris-max-shm-memory", Usage: "Specifies the maximum amount of shared memory"},
 	cli.StringFlag{Name: "solaris-milestone", Usage: "Specifies the SMF FMRI"},
 	cli.StringFlag{Name: "template", Usage: "base template to use for creating the configuration"},
+	cli.StringFlag{Name: "windows-hyperv-utilityVMPath", Usage: "specifies the path to the image used for the utility VM"},
+	cli.BoolFlag{Name: "windows-ignore-flushes-during-boot", Usage: "ignore flushes during boot"},
+	cli.StringSliceFlag{Name: "windows-layer-folders", Usage: "specifies a list of layer folders the container image relies on"},
+	cli.StringFlag{Name: "windows-network", Usage: "specifies network for container"},
+	cli.StringFlag{Name: "windows-resources-cpu", Usage: "specifies CPU for container"},
+	cli.Uint64Flag{Name: "windows-resources-memory-limit", Usage: "specifies limit of memory"},
+	cli.StringFlag{Name: "windows-resources-storage", Usage: "specifies storage for container"},
+	cli.BoolFlag{Name: "windows-servicing", Usage: "servicing operations"},
 }
 
 var generateCommand = cli.Command{
@@ -827,6 +835,57 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 		g.SetSolarisMilestone(context.String("solaris-milestone"))
 	}
 
+	if context.IsSet("windows-hyperv-utilityVMPath") {
+		g.SetWindowsHypervUntilityVMPath(context.String("windows-hyperv-utilityVMPath"))
+	}
+
+	if context.IsSet("windows-ignore-flushes-during-boot") {
+		g.SetWinodwsIgnoreFlushesDuringBoot(context.Bool("windows-ignore-flushes-during-boot"))
+	}
+
+	if context.IsSet("windows-layer-folders") {
+		folders := context.StringSlice("windows-layer-folders")
+		for _, folder := range folders {
+			g.AddWindowsLayerFolders(folder)
+		}
+	}
+
+	if context.IsSet("windows-network") {
+		network := context.String("windows-network")
+		tmpNetwork := rspec.WindowsNetwork{}
+		if err := json.Unmarshal([]byte(network), &tmpNetwork); err != nil {
+			return err
+		}
+		g.SetWindowsNetwork(tmpNetwork)
+	}
+
+	if context.IsSet("windows-resources-cpu") {
+		cpu := context.String("windows-resources-cpu")
+		tmpCPU := rspec.WindowsCPUResources{}
+		if err := json.Unmarshal([]byte(cpu), &tmpCPU); err != nil {
+			return err
+		}
+		g.SetWindowsResourcesCPU(tmpCPU)
+	}
+
+	if context.IsSet("windows-resources-memory-limit") {
+		limit := context.Uint64("windows-resources-memory-limit")
+		g.SetWindowsResourcesMemoryLimit(limit)
+	}
+
+	if context.IsSet("windows-resources-storage") {
+		storage := context.String("windows-resources-storage")
+		tmpStorage := rspec.WindowsStorageResources{}
+		if err := json.Unmarshal([]byte(storage), &tmpStorage); err != nil {
+			return err
+		}
+		g.SetWindowsResourcesStorage(tmpStorage)
+	}
+
+	if context.IsSet("windows-servicing") {
+		g.SetWinodwsServicing(context.Bool("windows-servicing"))
+	}
+
 	err := addSeccomp(context, g)
 	return err
 }

completions/bash/oci-runtime-tool

@@ -392,6 +392,12 @@ _oci-runtime-tool_generate() {
 		--solaris-max-shm-memory
 		 --solaris-milestone
 		--template
+		--windows-hyperv-utilityVMPath
+		--windows-layer-folders
+		--windows-network
+		--windows-resources-cpu
+		--windows-resources-memory-limit
+		--windows-resources-storage
 	"
 
 	local boolean_options="
@@ -411,6 +417,8 @@ _oci-runtime-tool_generate() {
 		--process-rlimits-remove-all
 		--process-terminal
 		--rootfs-readonly
+		--windows-ignore-flushes-during-boot
+		--windows-servicing
 	"
 
 	local all_options="$options_with_args $boolean_options"

generate/generate.go

@@ -1509,3 +1509,51 @@ func (g *Generator) SetSolarisMilestone(milestone string) {
 	g.initSpecSolaris()
 	g.spec.Solaris.Milestone = milestone
 }
+
+// SetWindowsHypervUntilityVMPath sets g.spec.Windows.HyperV.UtilityVMPath.
+func (g *Generator) SetWindowsHypervUntilityVMPath(path string) {
+	g.initSpecWindowsHyperV()
+	g.spec.Windows.HyperV.UtilityVMPath = path
+}
+
+// SetWinodwsIgnoreFlushesDuringBoot sets g.spec.Winodws.IgnoreFlushesDuringBoot.
+func (g *Generator) SetWinodwsIgnoreFlushesDuringBoot(ignore bool) {
+	g.initSpecWindows()
+	g.spec.Windows.IgnoreFlushesDuringBoot = ignore
+}
+
+// AddWindowsLayerFolders adds layer folders into  g.spec.Windows.LayerFolders.
+func (g *Generator) AddWindowsLayerFolders(folder string) {
+	g.initSpecWindows()
+	g.spec.Windows.LayerFolders = append(g.spec.Windows.LayerFolders, folder)
+}
+
+// SetWindowsNetwork sets g.spec.Windows.Network.
+func (g *Generator) SetWindowsNetwork(network rspec.WindowsNetwork) {
+	g.initSpecWindows()
+	g.spec.Windows.Network = &network
+}
+
+// SetWindowsResourcesCPU sets g.spec.Windows.Resources.CPU.
+func (g *Generator) SetWindowsResourcesCPU(cpu rspec.WindowsCPUResources) {
+	g.initSpecWindowsResources()
+	g.spec.Windows.Resources.CPU = &cpu
+}
+
+// SetWindowsResourcesMemoryLimit sets g.spec.Windows.Resources.Memory.Limit.
+func (g *Generator) SetWindowsResourcesMemoryLimit(limit uint64) {
+	g.initSpecWindowsResourcesMemory()
+	g.spec.Windows.Resources.Memory.Limit = &limit
+}
+
+// SetWindowsResourcesStorage sets g.spec.Windows.Resources.Storage.
+func (g *Generator) SetWindowsResourcesStorage(storage rspec.WindowsStorageResources) {
+	g.initSpecWindowsResources()
+	g.spec.Windows.Resources.Storage = &storage
+}
+
+// SetWinodwsServicing sets g.spec.Winodws.Servicing.
+func (g *Generator) SetWinodwsServicing(servicing bool) {
+	g.initSpecWindows()
+	g.spec.Windows.Servicing = servicing
+}

generate/spec.go

@@ -142,3 +142,31 @@ func (g *Generator) initSpecSolarisCappedMemory() {
 		g.spec.Solaris.CappedMemory = &rspec.SolarisCappedMemory{}
 	}
 }
+
+func (g *Generator) initSpecWindows() {
+	g.initSpec()
+	if g.spec.Windows == nil {
+		g.spec.Windows = &rspec.Windows{}
+	}
+}
+
+func (g *Generator) initSpecWindowsHyperV() {
+	g.initSpecWindows()
+	if g.spec.Windows.HyperV == nil {
+		g.spec.Windows.HyperV = &rspec.WindowsHyperV{}
+	}
+}
+
+func (g *Generator) initSpecWindowsResources() {
+	g.initSpecWindows()
+	if g.spec.Windows.Resources == nil {
+		g.spec.Windows.Resources = &rspec.WindowsResources{}
+	}
+}
+
+func (g *Generator) initSpecWindowsResourcesMemory() {
+	g.initSpecWindowsResources()
+	if g.spec.Windows.Resources.Memory == nil {
+		g.spec.Windows.Resources.Memory = &rspec.WindowsMemoryResources{}
+	}
+}

man/oci-runtime-tool-generate.1.md

@@ -479,6 +479,33 @@ read the configuration from `config.json`.
   Additional options will only adjust the relevant portions of your template.
   Templates are not validated for correctness, so the user should ensure that they are correct.
 
+**--windows-hyperv-utilityVMPath**=PATH
+  Specifies the path to the image used for the utility VM.
+
+**--windows-ignore-flushes-during-boot**=true|false
+  Whether to ignore flushes during boot.
+
+**--windows-layer-folders**=[]
+  Specifies a list of layer folders the container image relies on.
+
+**--windows-network**=""
+  Specifies network for container.
+  e.g. --windows-network='{"endpointList": ["7a010682-17e0-4455-a838-02e5d9655fe6"],"allowUnqualifiedDNSQuery": true,"DNSSearchList": ["a.com"],"networkSharedContainerName": "containerName"}'
+
+**--windows-resources-cpu**=""
+  Specifies cpu for container.
+  e.g. --windows-resources-cpu '{"count":100, "maximum": 5000}'
+
+**--windows-resources-memory-limit**=MEMORYLIMIT
+  Set limit of memory.
+
+**--windows-resources-storage**=""
+  Specifies storage for container.
+  e.g. --windows-resources-storage '{"iops": 50, "bps": 20}'
+
+**--windows-servicing**=true|false
+  Whether to servicing operations
+
 # EXAMPLES
 
 ## Generating container in read-only mode