From b6ce4c1a4a01b3185ce224fdba1cecc135a93f7c Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Fri, 5 Oct 2018 10:04:33 -0700 Subject: [PATCH] Remove EnableEquivalenceClassCache --- pkg/features/kube_features.go | 118 ++++++++++++------------ pkg/scheduler/core/generic_scheduler.go | 2 +- pkg/scheduler/factory/factory.go | 7 +- pkg/scheduler/scheduler.go | 2 +- 4 files changed, 64 insertions(+), 65 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 14b9f59e35..9a32da189c 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -431,65 +431,65 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS AppArmor: {Default: true, PreRelease: utilfeature.Beta}, DynamicKubeletConfig: {Default: true, PreRelease: utilfeature.Beta}, ExperimentalHostUserNamespaceDefaultingGate: {Default: false, PreRelease: utilfeature.Beta}, - DevicePlugins: {Default: true, PreRelease: utilfeature.Beta}, - TaintBasedEvictions: {Default: true, PreRelease: utilfeature.Beta}, - RotateKubeletServerCertificate: {Default: true, PreRelease: utilfeature.Beta}, - RotateKubeletClientCertificate: {Default: true, PreRelease: utilfeature.Beta}, - PersistentLocalVolumes: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.17 - LocalStorageCapacityIsolation: {Default: true, PreRelease: utilfeature.Beta}, - HugePages: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 - Sysctls: {Default: true, PreRelease: utilfeature.Beta}, - PodShareProcessNamespace: {Default: true, PreRelease: utilfeature.Beta}, - PodPriority: {Default: true, PreRelease: utilfeature.GA}, - TaintNodesByCondition: {Default: true, PreRelease: utilfeature.Beta}, - QOSReserved: {Default: false, PreRelease: utilfeature.Alpha}, - ExpandPersistentVolumes: {Default: true, PreRelease: utilfeature.Beta}, - ExpandInUsePersistentVolumes: {Default: false, PreRelease: utilfeature.Alpha}, - ExpandCSIVolumes: {Default: false, PreRelease: utilfeature.Alpha}, - AttachVolumeLimit: {Default: true, PreRelease: utilfeature.Beta}, - CPUManager: {Default: true, PreRelease: utilfeature.Beta}, - CPUCFSQuotaPeriod: {Default: false, PreRelease: utilfeature.Alpha}, - ServiceNodeExclusion: {Default: false, PreRelease: utilfeature.Alpha}, - MountContainers: {Default: false, PreRelease: utilfeature.Alpha}, - VolumeScheduling: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 - CSIPersistentVolume: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 - CSIDriverRegistry: {Default: true, PreRelease: utilfeature.Beta}, - CSINodeInfo: {Default: true, PreRelease: utilfeature.Beta}, - CustomPodDNS: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 - BlockVolume: {Default: true, PreRelease: utilfeature.Beta}, - StorageObjectInUseProtection: {Default: true, PreRelease: utilfeature.GA}, - ResourceLimitsPriorityFunction: {Default: false, PreRelease: utilfeature.Alpha}, - 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}, - BoundServiceAccountTokenVolume: {Default: false, PreRelease: utilfeature.Alpha}, - CRIContainerLogRotation: {Default: true, PreRelease: utilfeature.Beta}, - cloudfeatures.GCERegionalPersistentDisk: {Default: true, PreRelease: utilfeature.GA}, - CSIMigration: {Default: false, PreRelease: utilfeature.Alpha}, - CSIMigrationGCE: {Default: false, PreRelease: utilfeature.Alpha}, - CSIMigrationAWS: {Default: false, PreRelease: utilfeature.Alpha}, - RunAsGroup: {Default: true, PreRelease: utilfeature.Beta}, - CSIMigrationOpenStack: {Default: false, PreRelease: utilfeature.Alpha}, - VolumeSubpath: {Default: true, PreRelease: utilfeature.GA}, - BalanceAttachedNodeVolumes: {Default: false, PreRelease: utilfeature.Alpha}, - PodReadinessGates: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 - VolumeSubpathEnvExpansion: {Default: false, PreRelease: utilfeature.Alpha}, - KubeletPluginsWatcher: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 - ResourceQuotaScopeSelectors: {Default: true, PreRelease: utilfeature.Beta}, - CSIBlockVolume: {Default: true, PreRelease: utilfeature.Beta}, - CSIInlineVolume: {Default: false, PreRelease: utilfeature.Alpha}, - RuntimeClass: {Default: true, PreRelease: utilfeature.Beta}, - NodeLease: {Default: true, PreRelease: utilfeature.Beta}, - SCTPSupport: {Default: false, PreRelease: utilfeature.Alpha}, - VolumeSnapshotDataSource: {Default: false, PreRelease: utilfeature.Alpha}, - ProcMountType: {Default: false, PreRelease: utilfeature.Alpha}, - TTLAfterFinished: {Default: false, PreRelease: utilfeature.Alpha}, - KubeletPodResources: {Default: false, PreRelease: utilfeature.Alpha}, - WindowsGMSA: {Default: false, PreRelease: utilfeature.Alpha}, + DevicePlugins: {Default: true, PreRelease: utilfeature.Beta}, + TaintBasedEvictions: {Default: true, PreRelease: utilfeature.Beta}, + RotateKubeletServerCertificate: {Default: true, PreRelease: utilfeature.Beta}, + RotateKubeletClientCertificate: {Default: true, PreRelease: utilfeature.Beta}, + PersistentLocalVolumes: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.17 + LocalStorageCapacityIsolation: {Default: true, PreRelease: utilfeature.Beta}, + HugePages: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 + Sysctls: {Default: true, PreRelease: utilfeature.Beta}, + PodShareProcessNamespace: {Default: true, PreRelease: utilfeature.Beta}, + PodPriority: {Default: true, PreRelease: utilfeature.GA}, + TaintNodesByCondition: {Default: true, PreRelease: utilfeature.Beta}, + QOSReserved: {Default: false, PreRelease: utilfeature.Alpha}, + ExpandPersistentVolumes: {Default: true, PreRelease: utilfeature.Beta}, + ExpandInUsePersistentVolumes: {Default: false, PreRelease: utilfeature.Alpha}, + ExpandCSIVolumes: {Default: false, PreRelease: utilfeature.Alpha}, + AttachVolumeLimit: {Default: true, PreRelease: utilfeature.Beta}, + CPUManager: {Default: true, PreRelease: utilfeature.Beta}, + CPUCFSQuotaPeriod: {Default: false, PreRelease: utilfeature.Alpha}, + ServiceNodeExclusion: {Default: false, PreRelease: utilfeature.Alpha}, + MountContainers: {Default: false, PreRelease: utilfeature.Alpha}, + VolumeScheduling: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 + CSIPersistentVolume: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 + CSIDriverRegistry: {Default: true, PreRelease: utilfeature.Beta}, + CSINodeInfo: {Default: true, PreRelease: utilfeature.Beta}, + CustomPodDNS: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 + BlockVolume: {Default: true, PreRelease: utilfeature.Beta}, + StorageObjectInUseProtection: {Default: true, PreRelease: utilfeature.GA}, + ResourceLimitsPriorityFunction: {Default: false, PreRelease: utilfeature.Alpha}, + 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}, + BoundServiceAccountTokenVolume: {Default: false, PreRelease: utilfeature.Alpha}, + CRIContainerLogRotation: {Default: true, PreRelease: utilfeature.Beta}, + cloudfeatures.GCERegionalPersistentDisk: {Default: true, PreRelease: utilfeature.GA}, + CSIMigration: {Default: false, PreRelease: utilfeature.Alpha}, + CSIMigrationGCE: {Default: false, PreRelease: utilfeature.Alpha}, + CSIMigrationAWS: {Default: false, PreRelease: utilfeature.Alpha}, + RunAsGroup: {Default: true, PreRelease: utilfeature.Beta}, + CSIMigrationOpenStack: {Default: false, PreRelease: utilfeature.Alpha}, + VolumeSubpath: {Default: true, PreRelease: utilfeature.GA}, + BalanceAttachedNodeVolumes: {Default: false, PreRelease: utilfeature.Alpha}, + PodReadinessGates: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 + VolumeSubpathEnvExpansion: {Default: false, PreRelease: utilfeature.Alpha}, + KubeletPluginsWatcher: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 + ResourceQuotaScopeSelectors: {Default: true, PreRelease: utilfeature.Beta}, + CSIBlockVolume: {Default: true, PreRelease: utilfeature.Beta}, + CSIInlineVolume: {Default: false, PreRelease: utilfeature.Alpha}, + RuntimeClass: {Default: true, PreRelease: utilfeature.Beta}, + NodeLease: {Default: true, PreRelease: utilfeature.Beta}, + SCTPSupport: {Default: false, PreRelease: utilfeature.Alpha}, + VolumeSnapshotDataSource: {Default: false, PreRelease: utilfeature.Alpha}, + ProcMountType: {Default: false, PreRelease: utilfeature.Alpha}, + TTLAfterFinished: {Default: false, PreRelease: utilfeature.Alpha}, + KubeletPodResources: {Default: false, PreRelease: utilfeature.Alpha}, + WindowsGMSA: {Default: false, PreRelease: utilfeature.Alpha}, // inherited features from generic apiserver, relisted here to get a conflict if it is changed // unintentionally on either side: diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go index bf6f4b78fa..dcc1ddb4d3 100644 --- a/pkg/scheduler/core/generic_scheduler.go +++ b/pkg/scheduler/core/generic_scheduler.go @@ -28,7 +28,7 @@ import ( "k8s.io/klog" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" policy "k8s.io/api/policy/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/scheduler/factory/factory.go b/pkg/scheduler/factory/factory.go index 3838950314..ccf1e2ba7f 100644 --- a/pkg/scheduler/factory/factory.go +++ b/pkg/scheduler/factory/factory.go @@ -82,10 +82,9 @@ type Config struct { // It is expected that changes made via SchedulerCache will be observed // by NodeLister and Algorithm. SchedulerCache schedulerinternalcache.Cache - - NodeLister algorithm.NodeLister - Algorithm core.ScheduleAlgorithm - GetBinder func(pod *v1.Pod) Binder + NodeLister algorithm.NodeLister + Algorithm core.ScheduleAlgorithm + GetBinder func(pod *v1.Pod) Binder // PodConditionUpdater is used only in case of scheduling errors. If we succeed // with scheduling, PodScheduled condition will be updated in apiserver in /bind // handler so that binding and setting PodCondition it is atomic. diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 056805929f..feb1d866f9 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -25,7 +25,7 @@ import ( "k8s.io/klog" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait"