Skip to content

Commit 59ba132

Browse files
authored
Merge pull request kubernetes#124544 from carlory/remove-cephfs
remove the support for in-tree volume plugin cephfs
2 parents caafc21 + 6795820 commit 59ba132

File tree

9 files changed

+0
-904
lines changed

9 files changed

+0
-904
lines changed

cmd/kubelet/app/plugins.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323

2424
// Volume plugins
2525
"k8s.io/kubernetes/pkg/volume"
26-
"k8s.io/kubernetes/pkg/volume/cephfs"
2726
"k8s.io/kubernetes/pkg/volume/configmap"
2827
"k8s.io/kubernetes/pkg/volume/csi"
2928
"k8s.io/kubernetes/pkg/volume/downwardapi"
@@ -60,7 +59,6 @@ func ProbeVolumePlugins(featureGate featuregate.FeatureGate) ([]volume.VolumePlu
6059
allPlugins = append(allPlugins, nfs.ProbeVolumePlugins(volume.VolumeConfig{})...)
6160
allPlugins = append(allPlugins, secret.ProbeVolumePlugins()...)
6261
allPlugins = append(allPlugins, iscsi.ProbeVolumePlugins()...)
63-
allPlugins = append(allPlugins, cephfs.ProbeVolumePlugins()...)
6462
allPlugins = append(allPlugins, downwardapi.ProbeVolumePlugins()...)
6563
allPlugins = append(allPlugins, fc.ProbeVolumePlugins()...)
6664
allPlugins = append(allPlugins, configmap.ProbeVolumePlugins()...)

pkg/kubemark/hollow_kubelet.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import (
4242
kubeletutil "k8s.io/kubernetes/pkg/kubelet/util"
4343
"k8s.io/kubernetes/pkg/util/oom"
4444
"k8s.io/kubernetes/pkg/volume"
45-
"k8s.io/kubernetes/pkg/volume/cephfs"
4645
"k8s.io/kubernetes/pkg/volume/configmap"
4746
"k8s.io/kubernetes/pkg/volume/csi"
4847
"k8s.io/kubernetes/pkg/volume/downwardapi"
@@ -75,7 +74,6 @@ func volumePlugins() []volume.VolumePlugin {
7574
allPlugins = append(allPlugins, nfs.ProbeVolumePlugins(volume.VolumeConfig{})...)
7675
allPlugins = append(allPlugins, secret.ProbeVolumePlugins()...)
7776
allPlugins = append(allPlugins, iscsi.ProbeVolumePlugins()...)
78-
allPlugins = append(allPlugins, cephfs.ProbeVolumePlugins()...)
7977
allPlugins = append(allPlugins, downwardapi.ProbeVolumePlugins()...)
8078
allPlugins = append(allPlugins, fc.ProbeVolumePlugins()...)
8179
allPlugins = append(allPlugins, configmap.ProbeVolumePlugins()...)

pkg/volume/cephfs/OWNERS

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

0 commit comments

Comments
 (0)