Merge pull request #2761 from jterry75/remove_windows_v2_conditional

Build Windows V1 and V2 runtimes always

Makefile.windows

@@ -24,10 +24,3 @@ BINARY_SUFFIX=".exe"
 ifeq ($(GOARCH),amd64)
 	TESTFLAGS_RACE= -race
 endif
-
-# add support for building the Windows v2 runtime
-# based on the containerd-shim-runhcs-v1 shim rather
-# than the existing runtime on hcsshim
-ifeq (${BUILD_WINDOWS_V2},1)
-	BUILDTAGS += windows_v2
-endif

cmd/containerd/builtins_windows.go

@@ -1,4 +1,4 @@
-// +build !windows_v2
+// +build windows
 
 /*
    Copyright The containerd Authors.
@@ -21,6 +21,7 @@ package main
 import (
 	_ "github.com/containerd/containerd/diff/lcow"
 	_ "github.com/containerd/containerd/diff/windows"
+	_ "github.com/containerd/containerd/runtime/v2"
 	_ "github.com/containerd/containerd/snapshots/lcow"
 	_ "github.com/containerd/containerd/snapshots/windows"
 	_ "github.com/containerd/containerd/windows"

cmd/containerd/builtins_windows_v2.go

@@ -1,27 +0,0 @@
-// +build windows_v2
-
-/*
-   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/diff/lcow"
-	_ "github.com/containerd/containerd/diff/windows"
-	_ "github.com/containerd/containerd/runtime/v2"
-	_ "github.com/containerd/containerd/snapshots/lcow"
-	_ "github.com/containerd/containerd/snapshots/windows"
-)

services/tasks/local_unix.go

@@ -1,5 +1,3 @@
-// +build !windows_v2
-
 /*
    Copyright The containerd Authors.
 

services/tasks/local_windows.go

@@ -1,4 +1,4 @@
-// +build windows,windows_v2
+// +build ignore
 
 /*
    Copyright The containerd Authors.
@@ -23,6 +23,8 @@ import (
 	"github.com/containerd/containerd/runtime"
 )
 
+// TODO: JTERRY75 - When Windows V1 runtime is removed change this to only build
+// on Windows.
 var tasksServiceRequires = []plugin.Type{
 	plugin.RuntimePluginV2,
 	plugin.MetadataPlugin,