Merge pull request #6809 from jterry75/main

Add ctr support for CPUMax and CPUShares
2022-04-29 16:39:52 +01:00
parent 6b35307594 227156dac6
commit 65627f568f
4 changed files with 54 additions and 13 deletions
--- a/cmd/ctr/commands/run/run_windows.go
+++ b/cmd/ctr/commands/run/run_windows.go
@@ -143,6 +143,14 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
 		if ccount != 0 {
 			opts = append(opts, oci.WithWindowsCPUCount(ccount))
 		}
+		cshares := context.Uint64("cpu-shares")
+		if cshares != 0 {
+			opts = append(opts, oci.WithWindowsCPUShares(uint16(cshares)))
+		}
+		cmax := context.Uint64("cpu-max")
+		if cmax != 0 {
+			opts = append(opts, oci.WithWindowsCPUMaximum(uint16(cmax)))
+		}
 		for _, dev := range context.StringSlice("device") {
 			parts := strings.Split(dev, "://")
 			if len(parts) != 2 {