Move runtimeoptions out of cri package

zhsj · zhsj · commit 2818fdebaa06 · 2021-01-23T01:24:35.000+08:00
Since it's a standard set of runtime opts, and used in ctr as well,
it could be moved out of cri.

Signed-off-by: Shengjing Zhu &lt;zhsj@debian.org&gt;
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -31,7 +31,7 @@ import (
 	"github.com/containerd/containerd/contrib/nvidia"
 	"github.com/containerd/containerd/contrib/seccomp"
 	"github.com/containerd/containerd/oci"
-	crioptions "github.com/containerd/containerd/pkg/cri/runtimeoptions/v1"
+	runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1"
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/opencontainers/runtime-spec/specs-go"
@@ -316,7 +316,7 @@ func getRuntimeOptions(context *cli.Context) (interface{}, error) {
 	}
 
 	if configPath := context.String("runtime-config-path"); configPath != "" {
-		return &crioptions.Options{
+		return &runtimeoptions.Options{
 			ConfigPath: configPath,
 		}, nil
 	}
diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go
@@ -38,11 +38,11 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	runtimeoptions "github.com/containerd/containerd/pkg/cri/runtimeoptions/v1"
 	"github.com/containerd/containerd/pkg/cri/store"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 	imagestore "github.com/containerd/containerd/pkg/cri/store/image"
 	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
+	runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1"
 )
 
 const (
diff --git a/pkg/runtimeoptions/v1/api.pb.go b/pkg/runtimeoptions/v1/api.pb.go
diff --git a/pkg/runtimeoptions/v1/api.proto b/pkg/runtimeoptions/v1/api.proto
@@ -1,7 +1,7 @@
 // To regenerate api.pb.go run `make protos`
 syntax = "proto3";
 
-package cri.runtimeoptions.v1;
+package runtimeoptions.v1;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
@@ -14,7 +14,7 @@ option (gogoproto.unmarshaler_all) = true;
 option (gogoproto.goproto_unrecognized_all) = false;
 
 
-option go_package = "github.com/containerd/containerd/pkg/cri/runtimeoptions/v1;cri_runtimeoptions_v1";
+option go_package = "github.com/containerd/containerd/pkg/runtimeoptions/v1;runtimeoptions_v1";
 
 message Options {
 	// TypeUrl specifies the type of the content inside the config file.
