From ecf3180328bee7628c3a1b152027f08a0d511860 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Fri, 5 Oct 2018 11:01:33 -0700
Subject: [PATCH] Remove HyperVContainer

---
 pkg/features/kube_features.go                      |  7 -------
 pkg/kubelet/apis/well_known_annotations_windows.go | 12 +-----------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index ccff87deb4..a369986b67 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -197,12 +197,6 @@ const (
 	// Implement support for limiting pids in pods
 	SupportPodPidsLimit utilfeature.Feature = "SupportPodPidsLimit"
 
-	// owner: @feiskyer
-	// alpha: v1.10
-	//
-	// Enable Hyper-V containers on Windows
-	HyperVContainer utilfeature.Feature = "HyperVContainer"
-
 	// owner: @k82cn
 	// beta: v1.12
 	//
@@ -420,7 +414,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
 	SupportIPVSProxyMode:                    {Default: true, PreRelease: utilfeature.GA},
 	SupportPodPidsLimit:                     {Default: true, PreRelease: utilfeature.Beta},
 	SupportNodePidsLimit:                    {Default: false, PreRelease: utilfeature.Alpha},
-	HyperVContainer:                         {Default: false, PreRelease: utilfeature.Alpha},
 	ScheduleDaemonSetPods:                   {Default: true, PreRelease: utilfeature.Beta},
 	TokenRequest:                            {Default: true, PreRelease: utilfeature.Beta},
 	TokenRequestProjection:                  {Default: true, PreRelease: utilfeature.Beta},
diff --git a/pkg/kubelet/apis/well_known_annotations_windows.go b/pkg/kubelet/apis/well_known_annotations_windows.go
index 0e738895ee..16ba21bc39 100644
--- a/pkg/kubelet/apis/well_known_annotations_windows.go
+++ b/pkg/kubelet/apis/well_known_annotations_windows.go
@@ -18,11 +18,6 @@ limitations under the License.
 
 package apis
 
-import (
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	"k8s.io/kubernetes/pkg/features"
-)
-
 const (
 	// HypervIsolationAnnotationKey and HypervIsolationValue are used to run windows containers with hyperv isolation.
 	// Refer https://aka.ms/hyperv-container.
@@ -32,10 +27,5 @@ const (
 
 // ShouldIsolatedByHyperV returns true if a windows container should be run with hyperv isolation.
 func ShouldIsolatedByHyperV(annotations map[string]string) bool {
-	if !utilfeature.DefaultFeatureGate.Enabled(features.HyperVContainer) {
-		return false
-	}
-
-	v, ok := annotations[HypervIsolationAnnotationKey]
-	return ok && v == HypervIsolationValue
+	return false
 }