mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #85456 from BenTheElder/fix-providerless
Fix providerless
This commit is contained in:
commit
c97baa339b
@ -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
|
||||||
}
|
}
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
|
@ -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,3 +1,4 @@
|
|||||||
|
// +build !providerless
|
||||||
// +build linux
|
// +build linux
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// +build !providerless
|
||||||
// +build !linux,!windows
|
// +build !linux,!windows
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// +build !providerless
|
||||||
// +build windows
|
// +build windows
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// +build !providerless
|
||||||
// +build linux
|
// +build linux
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// +build !providerless
|
||||||
// +build !linux,!windows
|
// +build !linux,!windows
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// +build !providerless
|
||||||
// +build windows
|
// +build windows
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user