github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

fix providerless build post-CSI migration

Browse Source
This commit is contained in:
Benjamin Elder 2019-11-19 08:53:14 -08:00
parent 384e45febd
commit 820b7dfa1b
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/kube-controller-manager/app/plugins_providerless.go
View File

@ -19,20 +19,22 @@ limitations under the License.
package app
import (
"k8s.io/component-base/featuregate"
"k8s.io/kubernetes/pkg/volume"
)
func appendAttachableLegacyProviderVolumes(allPlugins []volume.VolumePlugin) []volume.VolumePlugin {
func appendAttachableLegacyProviderVolumes(allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) {
// no-op when compiled without legacy cloud providers
return allPlugins
return allPlugins, nil
}
func appendExpandableLegacyProviderVolumes(allPlugins []volume.VolumePlugin) []volume.VolumePlugin {
func appendExpandableLegacyProviderVolumes(allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) {
// no-op when compiled without legacy cloud providers
return allPlugins
return allPlugins, nil
}
func appendLegacyProviderVolumes(allPlugins []volume.VolumePlugin) []volume.VolumePlugin {
func appendLegacyProviderVolumes(allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) {
// no-op when compiled without legacy cloud providers
return allPlugins
return allPlugins, nil
}

10
cmd/kubelet/app/plugins_providerless.go
View File

@ -18,9 +18,13 @@ limitations under the License.
package app
import "k8s.io/kubernetes/pkg/volume"
import (
"k8s.io/component-base/featuregate"
func appendLegacyProviderVolumes(allPlugins []volume.VolumePlugin) []volume.VolumePlugin {
"k8s.io/kubernetes/pkg/volume"
)
func appendLegacyProviderVolumes(allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) {
// no-op when we didn't compile in support for these
return allPlugins
return allPlugins, nil
}