From 6eaf8af739e0b3451246c46969969787004d1c2f Mon Sep 17 00:00:00 2001 From: lauk001 Date: Fri, 23 Feb 2024 15:03:59 +0800 Subject: [PATCH] Add the contained and crio container runtimes --- cmd/command/setup_opts.go | 2 +- pkg/configmanager/asset/{nodeasset.go => node_asset.go} | 0 .../asset/{nodeosasset.go => node_os_asset.go} | 6 ++++-- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkg/configmanager/asset/{nodeasset.go => node_asset.go} (100%) rename pkg/configmanager/asset/{nodeosasset.go => node_os_asset.go} (82%) diff --git a/cmd/command/setup_opts.go b/cmd/command/setup_opts.go index 1fdc510..4ec7052 100644 --- a/cmd/command/setup_opts.go +++ b/cmd/command/setup_opts.go @@ -41,7 +41,7 @@ func SetupDeployCmdOpts(deployCmd *cobra.Command) { flags.UintVar(&opts.Opts.Worker.RAM, "worker-ram", 0, "Set worker RAM (units: MB)") flags.UintVar(&opts.Opts.Worker.Disk, "worker-disk", 0, "Set worker disk size (units: GB)") flags.StringArrayVarP(&opts.Opts.Worker.IP, "worker-ips", "", []string{}, "Set worker IPs") - flags.StringVarP(&opts.Opts.Runtime, "runtime", "", "", "Specify container runtime type (docker, isulad)") + flags.StringVarP(&opts.Opts.Runtime, "runtime", "", "", "Specify container runtime type (docker, isulad, contained or crio)") flags.StringVarP(&opts.Opts.ImageRegistry, "image-registry", "", "", "Specify the registry address for pulling the Kubernetes component container image") flags.StringVarP(&opts.Opts.PauseImage, "pause-image", "", "", "Specify the image for the pause container") flags.StringVarP(&opts.Opts.ReleaseImageUrl, "release-image-url", "", "", "Specify the URL of the NestOS container image that contains the Kubernetes component. Only supports the qcow2 format.") diff --git a/pkg/configmanager/asset/nodeasset.go b/pkg/configmanager/asset/node_asset.go similarity index 100% rename from pkg/configmanager/asset/nodeasset.go rename to pkg/configmanager/asset/node_asset.go diff --git a/pkg/configmanager/asset/nodeosasset.go b/pkg/configmanager/asset/node_os_asset.go similarity index 82% rename from pkg/configmanager/asset/nodeosasset.go rename to pkg/configmanager/asset/node_os_asset.go index 5f5d2cc..87f65e8 100644 --- a/pkg/configmanager/asset/nodeosasset.go +++ b/pkg/configmanager/asset/node_os_asset.go @@ -23,8 +23,10 @@ import ( var ( mapRuntime = map[string]string{ - "isulad": "/var/run/isulad.sock", - "docker": "/var/run/dockershim.sock", + "isulad": "/var/run/isulad.sock", + "docker": "/var/run/dockershim.sock", + "contained": "/var/run/containerd/containerd.sock", + "crio": "/var/run/crio/crio.sock", } ) -- Gitee