github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85456 from BenTheElder/fix-providerless

Browse Source 
Fix providerless
This commit is contained in:
Kubernetes Prow Robot 2019-11-19 16:21:19 -08:00 committed by GitHub
commit c97baa339b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 22 additions and 10 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 package app
import ( import (
"k8s.io/component-base/featuregate"
"k8s.io/kubernetes/pkg/volume" "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 // 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 // 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 // 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 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 // no-op when we didn't compile in support for these
return allPlugins return allPlugins, nil
} }

2
pkg/controller/nodeipam/nolegacyprovider.go
View File

@ -34,7 +34,7 @@ func startLegacyIPAM(
kubeClient clientset.Interface, kubeClient clientset.Interface,
clusterCIDRs []*net.IPNet, clusterCIDRs []*net.IPNet,
serviceCIDR *net.IPNet, serviceCIDR *net.IPNet,
nodeCIDRMaskSize int, nodeCIDRMaskSizes []int,
) { ) {
klog.Fatal("Error trying to Init(): legacy cloud provider support disabled at build time") klog.Fatal("Error trying to Init(): legacy cloud provider support disabled at build time")
} }

1
pkg/volume/awsebs/attacher_linux.go
View File

@ -1,3 +1,4 @@
// +build !providerless
// +build linux // +build linux
/* /*

1
pkg/volume/awsebs/attacher_unsupported.go
View File

@ -1,3 +1,4 @@
// +build !providerless
// +build !linux,!windows // +build !linux,!windows
/* /*

1
pkg/volume/awsebs/attacher_windows.go
View File

@ -1,3 +1,4 @@
// +build !providerless
// +build windows // +build windows
/* /*

1
pkg/volume/vsphere_volume/vsphere_volume_util_linux.go
View File

@ -1,3 +1,4 @@
// +build !providerless
// +build linux // +build linux
/* /*

1
pkg/volume/vsphere_volume/vsphere_volume_util_unsupported.go
View File

@ -1,3 +1,4 @@
// +build !providerless
// +build !linux,!windows // +build !linux,!windows
/* /*

1
pkg/volume/vsphere_volume/vsphere_volume_util_windows.go
View File

@ -1,3 +1,4 @@
// +build !providerless
// +build windows // +build windows
/* /*