Skip to content

Commit 0900340

Browse files
authored
Merge pull request kubernetes#95505 from wawa0210/fix-94490
Action Required: Windows hyper-v container featuregate is deprecated in 1.20 and will be removed in 1.21
2 parents af1c893 + e7f3198 commit 0900340

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

pkg/features/kube_features.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ const (
206206
// alpha: v1.10
207207
//
208208
// Enable Hyper-V containers on Windows
209+
// Deprecated in 1.20 and removed in 1.21
209210
HyperVContainer featuregate.Feature = "HyperVContainer"
210211

211212
// owner: @mikedanese
@@ -677,7 +678,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
677678
StorageObjectInUseProtection: {Default: true, PreRelease: featuregate.GA},
678679
SupportPodPidsLimit: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.21
679680
SupportNodePidsLimit: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.21
680-
HyperVContainer: {Default: false, PreRelease: featuregate.Alpha},
681+
HyperVContainer: {Default: false, PreRelease: featuregate.Deprecated},
681682
TokenRequest: {Default: true, PreRelease: featuregate.Beta},
682683
TokenRequestProjection: {Default: true, PreRelease: featuregate.Beta},
683684
BoundServiceAccountTokenVolume: {Default: false, PreRelease: featuregate.Alpha},

pkg/kubelet/apis/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ go_library(
1919
"@io_bazel_rules_go//go/platform:windows": [
2020
"//pkg/features:go_default_library",
2121
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
22+
"//vendor/k8s.io/klog/v2:go_default_library",
2223
],
2324
"//conditions:default": [],
2425
}),

pkg/kubelet/apis/well_known_annotations_windows.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package apis
2020

2121
import (
2222
utilfeature "k8s.io/apiserver/pkg/util/feature"
23+
"k8s.io/klog/v2"
2324
"k8s.io/kubernetes/pkg/features"
2425
)
2526

@@ -34,6 +35,8 @@ const (
3435

3536
// ShouldIsolatedByHyperV returns true if a windows container should be run with hyperv isolation.
3637
func ShouldIsolatedByHyperV(annotations map[string]string) bool {
38+
klog.Warningf("The hyper-v FeatureGate is deprecated in 1.20 and will be removed in 1.21")
39+
3740
if !utilfeature.DefaultFeatureGate.Enabled(features.HyperVContainer) {
3841
return false
3942
}

0 commit comments

Comments
 (0)