diff --git a/pkg/controller/daemon/BUILD b/pkg/controller/daemon/BUILD index fb3cce43aba..3ac43ce7b4c 100644 --- a/pkg/controller/daemon/BUILD +++ b/pkg/controller/daemon/BUILD @@ -65,7 +65,6 @@ go_test( "//pkg/apis/core:go_default_library", "//pkg/apis/scheduling:go_default_library", "//pkg/controller:go_default_library", - "//pkg/features:go_default_library", "//pkg/securitycontext:go_default_library", "//pkg/util/labels:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", @@ -78,7 +77,6 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/apiserver/pkg/storage/names:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", @@ -86,7 +84,6 @@ go_test( "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library", "//staging/src/k8s.io/client-go/util/workqueue:go_default_library", - "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", ], ) diff --git a/pkg/controller/daemon/daemon_controller_test.go b/pkg/controller/daemon/daemon_controller_test.go index 83d2edc1795..95936f62e6f 100644 --- a/pkg/controller/daemon/daemon_controller_test.go +++ b/pkg/controller/daemon/daemon_controller_test.go @@ -34,7 +34,6 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apiserver/pkg/storage/names" - utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" @@ -42,13 +41,11 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" "k8s.io/client-go/util/workqueue" - featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" podutil "k8s.io/kubernetes/pkg/api/v1/pod" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/scheduling" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/securitycontext" labelsutil "k8s.io/kubernetes/pkg/util/labels" ) @@ -1521,9 +1518,6 @@ func TestTaintPressureNodeDaemonLaunchesPod(t *testing.T) { {Key: v1.TaintNodePIDPressure, Effect: v1.TaintEffectNoSchedule}, } manager.nodeStore.Add(node) - - // Enabling critical pod and taint nodes by condition feature gate should create critical pod - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.TaintNodesByCondition, true)() manager.dsStore.Add(ds) syncAndValidateDaemonSets(t, manager, ds, podControl, 1, 0, 0) } diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 309dbb29556..9dbfb403451 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -119,22 +119,6 @@ const ( // Allows all containers in a pod to share a process namespace. PodShareProcessNamespace featuregate.Feature = "PodShareProcessNamespace" - // owner: @bsalamat - // alpha: v1.8 - // beta: v1.11 - // GA: v1.14 - // - // Add priority to pods. Priority affects scheduling and preemption of pods. - PodPriority featuregate.Feature = "PodPriority" - - // owner: @k82cn - // beta: v1.12 - // GA: v1.17 - // - // Taint nodes based on their condition status for 'NetworkUnavailable', - // 'MemoryPressure', 'PIDPressure' and 'DiskPressure'. - TaintNodesByCondition featuregate.Feature = "TaintNodesByCondition" - // owner: @sjenning // alpha: v1.11 // @@ -236,13 +220,6 @@ const ( // Enable Hyper-V containers on Windows HyperVContainer featuregate.Feature = "HyperVContainer" - // owner: @k82cn - // beta: v1.12 - // GA: v1.17 - // - // Schedule DaemonSet Pods by default scheduler instead of DaemonSet controller - ScheduleDaemonSetPods featuregate.Feature = "ScheduleDaemonSetPods" - // owner: @mikedanese // beta: v1.12 // @@ -308,13 +285,6 @@ const ( // Only applicable if the VolumeSubpath feature is also enabled VolumeSubpathEnvExpansion featuregate.Feature = "VolumeSubpathEnvExpansion" - // owner: @vikaschoudhary16 - // beta: v1.12 - // ga: v1.17 - // - // Enable resource quota scope selectors - ResourceQuotaScopeSelectors featuregate.Feature = "ResourceQuotaScopeSelectors" - // owner: @vladimirvivien // alpha: v1.11 // beta: v1.14 @@ -569,8 +539,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS Sysctls: {Default: true, PreRelease: featuregate.Beta}, EphemeralContainers: {Default: false, PreRelease: featuregate.Alpha}, PodShareProcessNamespace: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.19 - PodPriority: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.18 - TaintNodesByCondition: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.18 QOSReserved: {Default: false, PreRelease: featuregate.Alpha}, ExpandPersistentVolumes: {Default: true, PreRelease: featuregate.Beta}, ExpandInUsePersistentVolumes: {Default: true, PreRelease: featuregate.Beta}, @@ -590,7 +558,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS SupportPodPidsLimit: {Default: true, PreRelease: featuregate.Beta}, SupportNodePidsLimit: {Default: true, PreRelease: featuregate.Beta}, HyperVContainer: {Default: false, PreRelease: featuregate.Alpha}, - ScheduleDaemonSetPods: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.18 TokenRequest: {Default: true, PreRelease: featuregate.Beta}, TokenRequestProjection: {Default: true, PreRelease: featuregate.Beta}, BoundServiceAccountTokenVolume: {Default: false, PreRelease: featuregate.Alpha}, @@ -610,7 +577,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS VolumeSubpath: {Default: true, PreRelease: featuregate.GA}, BalanceAttachedNodeVolumes: {Default: false, PreRelease: featuregate.Alpha}, VolumeSubpathEnvExpansion: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.19, - ResourceQuotaScopeSelectors: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.18 CSIBlockVolume: {Default: true, PreRelease: featuregate.Beta}, CSIInlineVolume: {Default: true, PreRelease: featuregate.Beta}, RuntimeClass: {Default: true, PreRelease: featuregate.Beta},