From b30f4d11ef449c67be9d5c3cac2611018790e493 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Fri, 5 Oct 2018 11:22:54 -0700 Subject: [PATCH] Remove VolumeSnapshotDataSource --- pkg/api/persistentvolumeclaim/util.go | 2 +- pkg/features/kube_features.go | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/api/persistentvolumeclaim/util.go b/pkg/api/persistentvolumeclaim/util.go index 0c7116de5e..d51676da84 100644 --- a/pkg/api/persistentvolumeclaim/util.go +++ b/pkg/api/persistentvolumeclaim/util.go @@ -28,7 +28,7 @@ func DropDisabledFields(pvcSpec, oldPVCSpec *core.PersistentVolumeClaimSpec) { if !utilfeature.DefaultFeatureGate.Enabled(features.BlockVolume) && !volumeModeInUse(oldPVCSpec) { pvcSpec.VolumeMode = nil } - if !utilfeature.DefaultFeatureGate.Enabled(features.VolumeSnapshotDataSource) && !volumeSnapshotDataSourceInUse(oldPVCSpec) { + if !volumeSnapshotDataSourceInUse(oldPVCSpec) { pvcSpec.DataSource = nil } } diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 4646134d79..21517048b1 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -296,12 +296,6 @@ const ( // (Kube) Node Lifecycle Controller uses these heartbeats as a node health signal. NodeLease utilfeature.Feature = "NodeLease" - // owner: @xing-yang - // alpha: v1.12 - // - // Enable volume snapshot data source support. - VolumeSnapshotDataSource utilfeature.Feature = "VolumeSnapshotDataSource" - // owner: @jessfraz // alpha: v1.12 // @@ -412,7 +406,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS CSIInlineVolume: {Default: false, PreRelease: utilfeature.Alpha}, RuntimeClass: {Default: true, PreRelease: utilfeature.Beta}, NodeLease: {Default: true, PreRelease: utilfeature.Beta}, - VolumeSnapshotDataSource: {Default: false, PreRelease: utilfeature.Alpha}, ProcMountType: {Default: false, PreRelease: utilfeature.Alpha}, TTLAfterFinished: {Default: false, PreRelease: utilfeature.Alpha}, KubeletPodResources: {Default: false, PreRelease: utilfeature.Alpha},