Skip to content

Commit df074ed

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#124546 from carlory/remove-rbd
CephRBD volume plugin and its csi migration support are removed
2 parents db82fd1 + c8e91b9 commit df074ed

File tree

24 files changed

+8
-4305
lines changed

24 files changed

+8
-4305
lines changed

‎cmd/kube-controller-manager/app/plugins_providers.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"k8s.io/kubernetes/pkg/volume"
2525
"k8s.io/kubernetes/pkg/volume/csimigration"
2626
"k8s.io/kubernetes/pkg/volume/portworx"
27-
"k8s.io/kubernetes/pkg/volume/rbd"
2827
)
2928

3029
type probeFn func() []volume.VolumePlugin
@@ -57,7 +56,6 @@ type pluginInfo struct {
5756
func appendAttachableLegacyProviderVolumes(logger klog.Logger, allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) {
5857
pluginMigrationStatus := make(map[string]pluginInfo)
5958
pluginMigrationStatus[plugins.PortworxVolumePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationPortworx, pluginUnregisterFeature: features.InTreePluginPortworxUnregister, pluginProbeFunction: portworx.ProbeVolumePlugins}
60-
pluginMigrationStatus[plugins.RBDVolumePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationRBD, pluginUnregisterFeature: features.InTreePluginRBDUnregister, pluginProbeFunction: rbd.ProbeVolumePlugins}
6159
var err error
6260
for pluginName, pluginInfo := range pluginMigrationStatus {
6361
allPlugins, err = appendPluginBasedOnFeatureFlags(logger, allPlugins, pluginName, featureGate, pluginInfo)

‎cmd/kubelet/app/plugins_providers.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"k8s.io/kubernetes/pkg/volume"
2525
"k8s.io/kubernetes/pkg/volume/csimigration"
2626
"k8s.io/kubernetes/pkg/volume/portworx"
27-
"k8s.io/kubernetes/pkg/volume/rbd"
2827
)
2928

3029
type probeFn func() []volume.VolumePlugin
@@ -57,7 +56,6 @@ type pluginInfo struct {
5756
func appendLegacyProviderVolumes(allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) {
5857
pluginMigrationStatus := make(map[string]pluginInfo)
5958
pluginMigrationStatus[plugins.PortworxVolumePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationPortworx, pluginUnregisterFeature: features.InTreePluginPortworxUnregister, pluginProbeFunction: portworx.ProbeVolumePlugins}
60-
pluginMigrationStatus[plugins.RBDVolumePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationRBD, pluginUnregisterFeature: features.InTreePluginRBDUnregister, pluginProbeFunction: rbd.ProbeVolumePlugins}
6159
var err error
6260
for pluginName, pluginInfo := range pluginMigrationStatus {
6361
allPlugins, err = appendPluginBasedOnFeatureFlags(allPlugins, pluginName, featureGate, pluginInfo)

‎pkg/features/kube_features.go‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,6 @@ const (
141141
// Enables the Portworx in-tree driver to Portworx migration feature.
142142
CSIMigrationPortworx featuregate.Feature = "CSIMigrationPortworx"
143143

144-
// owner: @humblec
145-
// alpha: v1.23
146-
// deprecated: v1.28
147-
//
148-
// Enables the RBD in-tree driver to RBD CSI Driver migration feature.
149-
CSIMigrationRBD featuregate.Feature = "CSIMigrationRBD"
150-
151144
// owner: @fengzixu
152145
// alpha: v1.21
153146
//
@@ -305,13 +298,6 @@ const (
305298
// Disables the Portworx in-tree driver.
306299
InTreePluginPortworxUnregister featuregate.Feature = "InTreePluginPortworxUnregister"
307300

308-
// owner: @humblec
309-
// alpha: v1.23
310-
// deprecated: v1.28
311-
//
312-
// Disables the RBD in-tree driver.
313-
InTreePluginRBDUnregister featuregate.Feature = "InTreePluginRBDUnregister"
314-
315301
// owner: @divyenpatel
316302
// alpha: v1.21
317303
//
@@ -996,8 +982,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
996982

997983
CSIMigrationPortworx: {Default: false, PreRelease: featuregate.Beta}, // Off by default (requires Portworx CSI driver)
998984

999-
CSIMigrationRBD: {Default: false, PreRelease: featuregate.Deprecated}, // deprecated in 1.28, remove in 1.31
1000-
1001985
CSIVolumeHealth: {Default: false, PreRelease: featuregate.Alpha},
1002986

1003987
CloudControllerManagerWebhook: {Default: false, PreRelease: featuregate.Alpha},
@@ -1044,8 +1028,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
10441028

10451029
InTreePluginPortworxUnregister: {Default: false, PreRelease: featuregate.Alpha},
10461030

1047-
InTreePluginRBDUnregister: {Default: false, PreRelease: featuregate.Deprecated}, // deprecated in 1.28, remove in 1.31
1048-
10491031
InTreePluginvSphereUnregister: {Default: false, PreRelease: featuregate.Alpha},
10501032

10511033
JobBackoffLimitPerIndex: {Default: true, PreRelease: featuregate.Beta},

‎pkg/kubemark/hollow_kubelet.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ import (
5555
"k8s.io/kubernetes/pkg/volume/nfs"
5656
"k8s.io/kubernetes/pkg/volume/portworx"
5757
"k8s.io/kubernetes/pkg/volume/projected"
58-
"k8s.io/kubernetes/pkg/volume/rbd"
5958
"k8s.io/kubernetes/pkg/volume/secret"
6059
"k8s.io/kubernetes/pkg/volume/util/hostutil"
6160
"k8s.io/kubernetes/pkg/volume/util/subpath"
@@ -76,7 +75,6 @@ func volumePlugins() []volume.VolumePlugin {
7675
allPlugins = append(allPlugins, nfs.ProbeVolumePlugins(volume.VolumeConfig{})...)
7776
allPlugins = append(allPlugins, secret.ProbeVolumePlugins()...)
7877
allPlugins = append(allPlugins, iscsi.ProbeVolumePlugins()...)
79-
allPlugins = append(allPlugins, rbd.ProbeVolumePlugins()...)
8078
allPlugins = append(allPlugins, cephfs.ProbeVolumePlugins()...)
8179
allPlugins = append(allPlugins, downwardapi.ProbeVolumePlugins()...)
8280
allPlugins = append(allPlugins, fc.ProbeVolumePlugins()...)

‎pkg/scheduler/framework/plugins/nodevolumelimits/utils.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ func isCSIMigrationOn(csiNode *storagev1.CSINode, pluginName string) bool {
5151
return true
5252
case csilibplugins.CinderInTreePluginName:
5353
return true
54-
case csilibplugins.RBDVolumePluginName:
55-
if !utilfeature.DefaultFeatureGate.Enabled(features.CSIMigrationRBD) {
56-
return false
57-
}
5854
default:
5955
return false
6056
}

‎pkg/scheduler/framework/plugins/volumebinding/binder.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,8 +1100,6 @@ func isCSIMigrationOnForPlugin(pluginName string) bool {
11001100
return true
11011101
case csiplugins.PortworxVolumePluginName:
11021102
return utilfeature.DefaultFeatureGate.Enabled(features.CSIMigrationPortworx)
1103-
case csiplugins.RBDVolumePluginName:
1104-
return utilfeature.DefaultFeatureGate.Enabled(features.CSIMigrationRBD)
11051103
}
11061104
return false
11071105
}

‎pkg/volume/csi/csi_plugin.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,6 @@ func (p *csiPlugin) Init(host volume.VolumeHost) error {
250250
csitranslationplugins.PortworxVolumePluginName: func() bool {
251251
return utilfeature.DefaultFeatureGate.Enabled(features.CSIMigrationPortworx)
252252
},
253-
csitranslationplugins.RBDVolumePluginName: func() bool {
254-
return utilfeature.DefaultFeatureGate.Enabled(features.CSIMigrationRBD)
255-
},
256253
}
257254

258255
// Initializing the label management channels

‎pkg/volume/csimigration/plugin_manager.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ func (pm PluginManager) IsMigrationCompleteForPlugin(pluginName string) bool {
7474
return pm.featureGate.Enabled(features.InTreePluginvSphereUnregister)
7575
case csilibplugins.PortworxVolumePluginName:
7676
return pm.featureGate.Enabled(features.InTreePluginPortworxUnregister)
77-
case csilibplugins.RBDVolumePluginName:
78-
return pm.featureGate.Enabled(features.InTreePluginRBDUnregister)
7977
default:
8078
return false
8179
}
@@ -102,8 +100,6 @@ func (pm PluginManager) IsMigrationEnabledForPlugin(pluginName string) bool {
102100
return true
103101
case csilibplugins.PortworxVolumePluginName:
104102
return pm.featureGate.Enabled(features.CSIMigrationPortworx)
105-
case csilibplugins.RBDVolumePluginName:
106-
return pm.featureGate.Enabled(features.CSIMigrationRBD)
107103
default:
108104
return false
109105
}

‎pkg/volume/csimigration/plugin_manager_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,35 +39,35 @@ func TestIsMigratable(t *testing.T) {
3939
spec *volume.Spec
4040
}{
4141
{
42-
name: "RBD PV source with CSIMigrationGCE enabled",
43-
pluginFeature: features.CSIMigrationRBD,
42+
name: "Portworx PV source with CSIMigrationPortworx enabled",
43+
pluginFeature: features.CSIMigrationPortworx,
4444
pluginFeatureEnabled: true,
4545
isMigratable: true,
4646
csiMigrationEnabled: true,
4747
spec: &volume.Spec{
4848
PersistentVolume: &v1.PersistentVolume{
4949
Spec: v1.PersistentVolumeSpec{
5050
PersistentVolumeSource: v1.PersistentVolumeSource{
51-
RBD: &v1.RBDPersistentVolumeSource{
52-
RBDImage: "test-disk",
51+
PortworxVolume: &v1.PortworxVolumeSource{
52+
VolumeID: "test-volume",
5353
},
5454
},
5555
},
5656
},
5757
},
5858
},
5959
{
60-
name: "RBD PD PV Source with CSIMigrationGCE disabled",
61-
pluginFeature: features.CSIMigrationRBD,
60+
name: "Portworx PD PV Source with CSIMigrationPortworx disabled",
61+
pluginFeature: features.CSIMigrationPortworx,
6262
pluginFeatureEnabled: false,
6363
isMigratable: false,
6464
csiMigrationEnabled: true,
6565
spec: &volume.Spec{
6666
PersistentVolume: &v1.PersistentVolume{
6767
Spec: v1.PersistentVolumeSpec{
6868
PersistentVolumeSource: v1.PersistentVolumeSource{
69-
RBD: &v1.RBDPersistentVolumeSource{
70-
RBDImage: "test-disk",
69+
PortworxVolume: &v1.PortworxVolumeSource{
70+
VolumeID: "test-volume",
7171
},
7272
},
7373
},

‎pkg/volume/rbd/OWNERS‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)