Add CLI flag for --conmon-cgroup
@@ -143,6 +143,9 @@ func mergeConfig(config *server.Config, ctx *cli.Context) (string, error) {
if ctx.GlobalIsSet("cgroup-manager") {
config.CgroupManager = ctx.GlobalString("cgroup-manager")
}
+ if ctx.GlobalIsSet("conmon-cgroup") {
+ config.ConmonCgroup = ctx.GlobalString("conmon-cgroup")
+ }
if ctx.GlobalIsSet("hooks-dir") {
config.HooksDir = ctx.GlobalStringSlice("hooks-dir")
}
@@ -289,6 +292,10 @@ func main() {
Name: "conmon",
Usage: fmt.Sprintf("path to the conmon executable (default: %q)", defConf.Conmon),
},
+ cli.StringFlag{
+ Name: "conmon-cgroup",
+ Usage: fmt.Sprintf("cgroup used for conmon process (default: %q)", defConf.ConmonCgroup),
+ },
cli.StringFlag{
Name: "listen",
Usage: fmt.Sprintf("path to crio socket (default: %q)", defConf.Listen),
