Merge pull request #3494 from jterry75/remove_v2

Completely remove Windows v2 in-tree shim

cmd/containerd-shim-runhcs-v1/main.go

@@ -1,28 +0,0 @@
-// +build windows
-
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package main
-
-import (
-	"github.com/containerd/containerd/runtime/v2/runhcs"
-	"github.com/containerd/containerd/runtime/v2/shim"
-)
-
-func main() {
-	shim.Run("io.containerd.runhcs.v1", runhcs.New)
-}

cmd/ctr/commands/run/run_windows.go

@@ -19,11 +19,11 @@ package run
 import (
 	gocontext "context"
 
+	"github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
 	"github.com/containerd/console"
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/cmd/ctr/commands"
 	"github.com/containerd/containerd/oci"
-	"github.com/containerd/containerd/runtime/v2/runhcs/options"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"