generate: add windows-servicing option

Signed-off-by: Zhou Hao <[email protected]>

Author: Zhou Hao

cmd/oci-runtime-tool/generate.go

@@ -129,6 +129,7 @@ var generateFlags = []cli.Flag{
 	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{
@@ -843,18 +844,20 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 
 	if context.IsSet("windows-network") {
 		network := context.String("windows-network")
-		err := g.SetWindowsNetwork(network)
-		if err != nil {
+		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")
-		err := g.SetWindowsResourcesCPU(cpu)
-		if err != nil {
+		tmpCPU := rspec.WindowsCPUResources{}
+		if err := json.Unmarshal([]byte(cpu), &tmpCPU); err != nil {
 			return err
 		}
+		g.SetWindowsResourcesCPU(tmpCPU)
 	}
 
 	if context.IsSet("windows-resources-memory-limit") {
@@ -864,10 +867,15 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 
 	if context.IsSet("windows-resources-storage") {
 		storage := context.String("windows-resources-storage")
-		err := g.SetWindowsResourcesStorage(storage)
-		if err != nil {
+		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)

completions/bash/oci-runtime-tool

@@ -417,6 +417,7 @@ _oci-runtime-tool_generate() {
 		--process-terminal
 		--rootfs-readonly
 		--windows-ignore-flushes-during-boot
+		--windows-servicing
 	"
 
 	local all_options="$options_with_args $boolean_options"

generate/generate.go

@@ -1510,27 +1510,15 @@ func (g *Generator) AddWindowsLayerFolders(folder string) {
 }
 
 // SetWindowsNetwork sets g.spec.Windows.Network.
-func (g *Generator) SetWindowsNetwork(network string) error {
+func (g *Generator) SetWindowsNetwork(network rspec.WindowsNetwork) {
 	g.initSpecWindows()
-	tmpNetwork := &rspec.WindowsNetwork{}
-	err := json.Unmarshal([]byte(network), tmpNetwork)
-	if err != nil {
-		return err
-	}
-	g.spec.Windows.Network = tmpNetwork
-	return nil
+	g.spec.Windows.Network = &network
 }
 
 // SetWindowsResourcesCPU sets g.spec.Windows.Resources.CPU.
-func (g *Generator) SetWindowsResourcesCPU(cpu string) error {
+func (g *Generator) SetWindowsResourcesCPU(cpu rspec.WindowsCPUResources) {
 	g.initSpecWindowsResources()
-	tmpCPU := &rspec.WindowsCPUResources{}
-	err := json.Unmarshal([]byte(cpu), tmpCPU)
-	if err != nil {
-		return err
-	}
-	g.spec.Windows.Resources.CPU = tmpCPU
-	return nil
+	g.spec.Windows.Resources.CPU = &cpu
 }
 
 // SetWindowsResourcesMemoryLimit sets g.spec.Windows.Resources.Memory.Limit.
@@ -1540,13 +1528,13 @@ func (g *Generator) SetWindowsResourcesMemoryLimit(limit uint64) {
 }
 
 // SetWindowsResourcesStorage sets g.spec.Windows.Resources.Storage.
-func (g *Generator) SetWindowsResourcesStorage(storage string) error {
+func (g *Generator) SetWindowsResourcesStorage(storage rspec.WindowsStorageResources) {
 	g.initSpecWindowsResources()
-	tmpStorage := &rspec.WindowsStorageResources{}
-	err := json.Unmarshal([]byte(storage), tmpStorage)
-	if err != nil {
-		return err
-	}
-	g.spec.Windows.Resources.Storage = tmpStorage
-	return nil
+	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
 }

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

@@ -499,6 +499,9 @@ read the configuration from `config.json`.
   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