diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go index 7f7034423a..a5c05497cc 100644 --- a/cmd/hyperkube/main.go +++ b/cmd/hyperkube/main.go @@ -34,7 +34,6 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/logs" - cloudcontrollermanager "k8s.io/kubernetes/cmd/cloud-controller-manager/app" kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app" kubecontrollermanager "k8s.io/kubernetes/cmd/kube-controller-manager/app" kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app" @@ -92,7 +91,6 @@ func NewHyperKubeCommand() (*cobra.Command, []func() *cobra.Command) { scheduler := func() *cobra.Command { return kubescheduler.NewSchedulerCommand() } kubectlCmd := func() *cobra.Command { return kubectl.NewDefaultKubectlCommand() } kubelet := func() *cobra.Command { return kubelet.NewKubeletCommand() } - cloudController := func() *cobra.Command { return cloudcontrollermanager.NewCloudControllerManagerCommand() } commandFns := []func() *cobra.Command{ apiserver, @@ -101,7 +99,6 @@ func NewHyperKubeCommand() (*cobra.Command, []func() *cobra.Command) { scheduler, kubectlCmd, kubelet, - cloudController, } makeSymlinksFlag := false diff --git a/cmd/kube-apiserver/app/options/globalflags.go b/cmd/kube-apiserver/app/options/globalflags.go index 70ce6492ed..bef513605b 100644 --- a/cmd/kube-apiserver/app/options/globalflags.go +++ b/cmd/kube-apiserver/app/options/globalflags.go @@ -23,7 +23,6 @@ import ( // ensure libs have a chance to globally register their flags _ "k8s.io/apiserver/pkg/admission" - _ "k8s.io/kubernetes/pkg/cloudprovider/providers" ) // AddCustomGlobalFlags explicitly registers flags that internal packages register @@ -32,9 +31,6 @@ import ( func AddCustomGlobalFlags(fs *pflag.FlagSet) { // Lookup flags in global flag set and re-register the values with our flagset. - // Adds flags from k8s.io/kubernetes/pkg/cloudprovider/providers. - globalflag.Register(fs, "cloud-provider-gce-lb-src-cidrs") - // Adds flags from k8s.io/apiserver/pkg/admission. globalflag.Register(fs, "default-not-ready-toleration-seconds") globalflag.Register(fs, "default-unreachable-toleration-seconds") diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 9978079f41..e6a1a9333c 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -126,10 +126,6 @@ controller, and serviceaccounts controller.`, namedFlagSets := s.Flags(KnownControllers(), ControllersDisabledByDefault.List()) verflag.AddFlags(namedFlagSets.FlagSet("global")) globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name()) - // hoist this flag from the global flagset to preserve the commandline until - // the gce cloudprovider is removed. - globalflag.Register(namedFlagSets.FlagSet("generic"), "cloud-provider-gce-lb-src-cidrs") - namedFlagSets.FlagSet("generic").MarkDeprecated("cloud-provider-gce-lb-src-cidrs", "This flag will be removed once the GCE Cloud Provider is removed from kube-controller-manager") for _, f := range namedFlagSets.FlagSets { fs.AddFlagSet(f) } diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go index 514c8fa94d..ade2689a77 100644 --- a/cmd/kube-controller-manager/app/plugins.go +++ b/cmd/kube-controller-manager/app/plugins.go @@ -25,34 +25,15 @@ import ( "k8s.io/klog" - // Cloud providers - cloudprovider "k8s.io/cloud-provider" - // ensure the cloud providers are installed - _ "k8s.io/kubernetes/pkg/cloudprovider/providers" // Volume plugins "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/pkg/volume/awsebs" - "k8s.io/kubernetes/pkg/volume/azure_dd" - "k8s.io/kubernetes/pkg/volume/azure_file" - "k8s.io/kubernetes/pkg/volume/cinder" "k8s.io/kubernetes/pkg/volume/csi" - "k8s.io/kubernetes/pkg/volume/fc" "k8s.io/kubernetes/pkg/volume/flexvolume" - "k8s.io/kubernetes/pkg/volume/flocker" - "k8s.io/kubernetes/pkg/volume/gcepd" - "k8s.io/kubernetes/pkg/volume/glusterfs" "k8s.io/kubernetes/pkg/volume/hostpath" "k8s.io/kubernetes/pkg/volume/iscsi" "k8s.io/kubernetes/pkg/volume/local" "k8s.io/kubernetes/pkg/volume/nfs" - "k8s.io/kubernetes/pkg/volume/photon_pd" - "k8s.io/kubernetes/pkg/volume/portworx" - "k8s.io/kubernetes/pkg/volume/quobyte" - "k8s.io/kubernetes/pkg/volume/rbd" - "k8s.io/kubernetes/pkg/volume/scaleio" - "k8s.io/kubernetes/pkg/volume/storageos" volumeutil "k8s.io/kubernetes/pkg/volume/util" - "k8s.io/kubernetes/pkg/volume/vsphere_volume" utilfeature "k8s.io/apiserver/pkg/util/feature" persistentvolumeconfig "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config" @@ -67,18 +48,7 @@ import ( func ProbeAttachableVolumePlugins() []volume.VolumePlugin { allPlugins := []volume.VolumePlugin{} - allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, gcepd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, portworx.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, fc.ProbeVolumePlugins()...) allPlugins = append(allPlugins, iscsi.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, rbd.ProbeVolumePlugins()...) if utilfeature.DefaultFeatureGate.Enabled(features.CSIPersistentVolume) { allPlugins = append(allPlugins, csi.ProbeVolumePlugins()...) } @@ -95,27 +65,13 @@ func GetDynamicPluginProber(config persistentvolumeconfig.VolumeConfiguration) v // ProbeExpandableVolumePlugins returns volume plugins which are expandable func ProbeExpandableVolumePlugins(config persistentvolumeconfig.VolumeConfiguration) []volume.VolumePlugin { allPlugins := []volume.VolumePlugin{} - - allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, gcepd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, portworx.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, glusterfs.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, rbd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, azure_file.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, fc.ProbeVolumePlugins()...) return allPlugins } // ProbeControllerVolumePlugins collects all persistent volume plugins into an // easy to use list. Only volume plugins that implement any of // provisioner/recycler/deleter interface should be returned. -func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config persistentvolumeconfig.VolumeConfiguration) []volume.VolumePlugin { +func ProbeControllerVolumePlugins(_ interface{}, config persistentvolumeconfig.VolumeConfiguration) []volume.VolumePlugin { allPlugins := []volume.VolumePlugin{} // The list of plugins to probe is decided by this binary, not @@ -147,24 +103,7 @@ func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config persiste klog.Fatalf("Could not create NFS recycler pod from file %s: %+v", config.PersistentVolumeRecyclerConfiguration.PodTemplateFilePathNFS, err) } allPlugins = append(allPlugins, nfs.ProbeVolumePlugins(nfsConfig)...) - allPlugins = append(allPlugins, glusterfs.ProbeVolumePlugins()...) - // add rbd provisioner - allPlugins = append(allPlugins, rbd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, quobyte.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, azure_file.ProbeVolumePlugins()...) - - allPlugins = append(allPlugins, flocker.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, portworx.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...) allPlugins = append(allPlugins, local.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...) - - allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, gcepd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...) if utilfeature.DefaultFeatureGate.Enabled(features.CSIInlineVolume) { allPlugins = append(allPlugins, csi.ProbeVolumePlugins()...) diff --git a/cmd/kubectl/kubectl.go b/cmd/kubectl/kubectl.go index dff1143b01..38570a30d1 100644 --- a/cmd/kubectl/kubectl.go +++ b/cmd/kubectl/kubectl.go @@ -28,9 +28,6 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/kubernetes/pkg/kubectl/cmd" "k8s.io/kubernetes/pkg/kubectl/util/logs" - - // Import to initialize client auth plugins. - _ "k8s.io/client-go/plugin/pkg/client/auth" ) func main() { diff --git a/cmd/kubelet/app/options/globalflags.go b/cmd/kubelet/app/options/globalflags.go index e8853e9270..d085d9cf93 100644 --- a/cmd/kubelet/app/options/globalflags.go +++ b/cmd/kubelet/app/options/globalflags.go @@ -28,10 +28,6 @@ import ( "k8s.io/component-base/logs" "k8s.io/klog" "k8s.io/kubernetes/pkg/version/verflag" - - // ensure libs have a chance to globally register their flags - _ "k8s.io/kubernetes/pkg/credentialprovider/azure" - _ "k8s.io/kubernetes/pkg/credentialprovider/gcp" ) // AddGlobalFlags explicitly registers flags that libraries (glog, verflag, etc.) register @@ -40,7 +36,6 @@ import ( func AddGlobalFlags(fs *pflag.FlagSet) { addKlogFlags(fs) addCadvisorFlags(fs) - addCredentialProviderFlags(fs) verflag.AddFlags(fs) logs.AddFlags(fs) } diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go index c566016a27..e664a8d8a3 100644 --- a/cmd/kubelet/app/plugins.go +++ b/cmd/kubelet/app/plugins.go @@ -18,43 +18,22 @@ package app // This file exists to force the desired plugin implementations to be linked. import ( - // Credential providers - _ "k8s.io/kubernetes/pkg/credentialprovider/aws" - _ "k8s.io/kubernetes/pkg/credentialprovider/azure" - _ "k8s.io/kubernetes/pkg/credentialprovider/gcp" "k8s.io/utils/exec" + // Volume plugins "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/pkg/volume/awsebs" - "k8s.io/kubernetes/pkg/volume/azure_dd" - "k8s.io/kubernetes/pkg/volume/azure_file" - "k8s.io/kubernetes/pkg/volume/cephfs" - "k8s.io/kubernetes/pkg/volume/cinder" "k8s.io/kubernetes/pkg/volume/configmap" "k8s.io/kubernetes/pkg/volume/csi" "k8s.io/kubernetes/pkg/volume/downwardapi" "k8s.io/kubernetes/pkg/volume/emptydir" - "k8s.io/kubernetes/pkg/volume/fc" "k8s.io/kubernetes/pkg/volume/flexvolume" - "k8s.io/kubernetes/pkg/volume/flocker" - "k8s.io/kubernetes/pkg/volume/gcepd" - "k8s.io/kubernetes/pkg/volume/git_repo" - "k8s.io/kubernetes/pkg/volume/glusterfs" "k8s.io/kubernetes/pkg/volume/hostpath" "k8s.io/kubernetes/pkg/volume/iscsi" "k8s.io/kubernetes/pkg/volume/local" "k8s.io/kubernetes/pkg/volume/nfs" - "k8s.io/kubernetes/pkg/volume/photon_pd" - "k8s.io/kubernetes/pkg/volume/portworx" "k8s.io/kubernetes/pkg/volume/projected" - "k8s.io/kubernetes/pkg/volume/quobyte" - "k8s.io/kubernetes/pkg/volume/rbd" - "k8s.io/kubernetes/pkg/volume/scaleio" "k8s.io/kubernetes/pkg/volume/secret" - "k8s.io/kubernetes/pkg/volume/storageos" - "k8s.io/kubernetes/pkg/volume/vsphere_volume" - // Cloud providers - _ "k8s.io/kubernetes/pkg/cloudprovider/providers" + // features check utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/features" @@ -70,32 +49,15 @@ func ProbeVolumePlugins() []volume.VolumePlugin { // // Kubelet does not currently need to configure volume plugins. // If/when it does, see kube-controller-manager/app/plugins.go for example of using volume.VolumeConfig - allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...) allPlugins = append(allPlugins, emptydir.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, gcepd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, git_repo.ProbeVolumePlugins()...) allPlugins = append(allPlugins, hostpath.ProbeVolumePlugins(volume.VolumeConfig{})...) allPlugins = append(allPlugins, nfs.ProbeVolumePlugins(volume.VolumeConfig{})...) allPlugins = append(allPlugins, secret.ProbeVolumePlugins()...) allPlugins = append(allPlugins, iscsi.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, glusterfs.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, rbd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, quobyte.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, cephfs.ProbeVolumePlugins()...) allPlugins = append(allPlugins, downwardapi.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, fc.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, flocker.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, azure_file.ProbeVolumePlugins()...) allPlugins = append(allPlugins, configmap.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...) allPlugins = append(allPlugins, projected.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, portworx.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...) allPlugins = append(allPlugins, local.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...) if utilfeature.DefaultFeatureGate.Enabled(features.CSIPersistentVolume) { allPlugins = append(allPlugins, csi.ProbeVolumePlugins()...) } diff --git a/pkg/controller/nodeipam/ipam/adapter.go b/pkg/controller/nodeipam/ipam/adapter.go index 54a998943d..c7caac709f 100644 --- a/pkg/controller/nodeipam/ipam/adapter.go +++ b/pkg/controller/nodeipam/ipam/adapter.go @@ -1,3 +1,5 @@ +// +build delete + /* Copyright 2017 The Kubernetes Authors. @@ -30,21 +32,18 @@ import ( v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/record" nodeutil "k8s.io/kubernetes/pkg/util/node" - "k8s.io/legacy-cloud-providers/gce" "k8s.io/metrics/pkg/client/clientset/versioned/scheme" ) type adapter struct { k8s clientset.Interface - cloud *gce.Cloud recorder record.EventRecorder } -func newAdapter(k8s clientset.Interface, cloud *gce.Cloud) *adapter { +func newAdapter(k8s clientset.Interface, cloud interface{}) *adapter { ret := &adapter{ k8s: k8s, - cloud: cloud, } broadcaster := record.NewBroadcaster() diff --git a/pkg/controller/nodeipam/ipam/cidr_allocator.go b/pkg/controller/nodeipam/ipam/cidr_allocator.go index d667d11eec..ba3bfbe5fc 100644 --- a/pkg/controller/nodeipam/ipam/cidr_allocator.go +++ b/pkg/controller/nodeipam/ipam/cidr_allocator.go @@ -30,7 +30,6 @@ import ( "k8s.io/apimachinery/pkg/util/wait" informers "k8s.io/client-go/informers/core/v1" clientset "k8s.io/client-go/kubernetes" - cloudprovider "k8s.io/cloud-provider" ) type nodeAndCIDR struct { @@ -94,7 +93,7 @@ type CIDRAllocator interface { } // New creates a new CIDR range allocator. -func New(kubeClient clientset.Interface, cloud cloudprovider.Interface, nodeInformer informers.NodeInformer, allocatorType CIDRAllocatorType, clusterCIDR, serviceCIDR *net.IPNet, nodeCIDRMaskSize int) (CIDRAllocator, error) { +func New(kubeClient clientset.Interface, cloud interface{}, nodeInformer informers.NodeInformer, allocatorType CIDRAllocatorType, clusterCIDR, serviceCIDR *net.IPNet, nodeCIDRMaskSize int) (CIDRAllocator, error) { nodeList, err := listNodes(kubeClient) if err != nil { return nil, err @@ -103,8 +102,8 @@ func New(kubeClient clientset.Interface, cloud cloudprovider.Interface, nodeInfo switch allocatorType { case RangeAllocatorType: return NewCIDRRangeAllocator(kubeClient, nodeInformer, clusterCIDR, serviceCIDR, nodeCIDRMaskSize, nodeList) - case CloudAllocatorType: - return NewCloudCIDRAllocator(kubeClient, cloud, nodeInformer) + //case CloudAllocatorType: + // return NewCloudCIDRAllocator(kubeClient, cloud, nodeInformer) default: return nil, fmt.Errorf("Invalid CIDR allocator type: %v", allocatorType) } diff --git a/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go b/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go index c5fde54632..2ec7e04ebc 100644 --- a/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go +++ b/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go @@ -1,3 +1,5 @@ +// +build deleted + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/controller/nodeipam/ipam/controller.go b/pkg/controller/nodeipam/ipam/controller.go index 4710b74ea9..5898286ef9 100644 --- a/pkg/controller/nodeipam/ipam/controller.go +++ b/pkg/controller/nodeipam/ipam/controller.go @@ -1,3 +1,5 @@ +// +build deleted + /* Copyright 2017 The Kubernetes Authors. @@ -24,15 +26,13 @@ import ( "k8s.io/klog" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" informers "k8s.io/client-go/informers/core/v1" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - cloudprovider "k8s.io/cloud-provider" "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/cidrset" nodesync "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/sync" nodeutil "k8s.io/kubernetes/pkg/controller/util/node" - "k8s.io/legacy-cloud-providers/gce" ) // Config for the IPAM controller. @@ -63,7 +63,7 @@ type Controller struct { func NewController( config *Config, kubeClient clientset.Interface, - cloud cloudprovider.Interface, + _ interface{}, clusterCIDR, serviceCIDR *net.IPNet, nodeCIDRMaskSize int) (*Controller, error) { @@ -71,11 +71,6 @@ func NewController( return nil, fmt.Errorf("invalid IPAM controller mode %q", config.Mode) } - gceCloud, ok := cloud.(*gce.Cloud) - if !ok { - return nil, fmt.Errorf("cloud IPAM controller does not support %q provider", cloud.ProviderName()) - } - set, err := cidrset.NewCIDRSet(clusterCIDR, nodeCIDRMaskSize) if err != nil { return nil, err @@ -83,7 +78,6 @@ func NewController( c := &Controller{ config: config, - adapter: newAdapter(kubeClient, gceCloud), syncers: make(map[string]*nodesync.NodeSync), set: set, } diff --git a/pkg/controller/nodeipam/node_ipam_controller.go b/pkg/controller/nodeipam/node_ipam_controller.go index baaf1c3443..873caf94db 100644 --- a/pkg/controller/nodeipam/node_ipam_controller.go +++ b/pkg/controller/nodeipam/node_ipam_controller.go @@ -28,14 +28,13 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" coreinformers "k8s.io/client-go/informers/core/v1" clientset "k8s.io/client-go/kubernetes" corelisters "k8s.io/client-go/listers/core/v1" cloudprovider "k8s.io/cloud-provider" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/nodeipam/ipam" - nodesync "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/sync" "k8s.io/kubernetes/pkg/util/metrics" ) @@ -120,34 +119,12 @@ func NewNodeIpamController( allocatorType: allocatorType, } - // TODO: Abstract this check into a generic controller manager should run method. - if ic.allocatorType == ipam.IPAMFromClusterAllocatorType || ic.allocatorType == ipam.IPAMFromCloudAllocatorType { - cfg := &ipam.Config{ - Resync: ipamResyncInterval, - MaxBackoff: ipamMaxBackoff, - InitialRetry: ipamInitialBackoff, - } - switch ic.allocatorType { - case ipam.IPAMFromClusterAllocatorType: - cfg.Mode = nodesync.SyncFromCluster - case ipam.IPAMFromCloudAllocatorType: - cfg.Mode = nodesync.SyncFromCloud - } - ipamc, err := ipam.NewController(cfg, kubeClient, cloud, clusterCIDR, serviceCIDR, nodeCIDRMaskSize) - if err != nil { - klog.Fatalf("Error creating ipam controller: %v", err) - } - if err := ipamc.Start(nodeInformer); err != nil { - klog.Fatalf("Error trying to Init(): %v", err) - } - } else { var err error ic.cidrAllocator, err = ipam.New( kubeClient, cloud, nodeInformer, ic.allocatorType, ic.clusterCIDR, ic.serviceCIDR, nodeCIDRMaskSize) if err != nil { return nil, err } - } ic.nodeLister = nodeInformer.Lister() ic.nodeInformerSynced = nodeInformer.Informer().HasSynced diff --git a/pkg/kubeapiserver/authenticator/config.go b/pkg/kubeapiserver/authenticator/config.go index 03e05d7974..886b57431c 100644 --- a/pkg/kubeapiserver/authenticator/config.go +++ b/pkg/kubeapiserver/authenticator/config.go @@ -39,8 +39,6 @@ import ( "k8s.io/apiserver/plugin/pkg/authenticator/token/oidc" "k8s.io/apiserver/plugin/pkg/authenticator/token/webhook" - // Initialize all known client auth plugins. - _ "k8s.io/client-go/plugin/pkg/client/auth" certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/keyutil" "k8s.io/kubernetes/pkg/features" diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index d06ebab533..5a648dcaba 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -32,12 +32,6 @@ import ( _ "github.com/google/cadvisor/container/docker/install" _ "github.com/google/cadvisor/container/systemd/install" - // Register cloud info providers. - // TODO(#76660): Remove this once the cAdvisor endpoints are removed. - _ "github.com/google/cadvisor/utils/cloudinfo/aws" - _ "github.com/google/cadvisor/utils/cloudinfo/azure" - _ "github.com/google/cadvisor/utils/cloudinfo/gce" - "github.com/google/cadvisor/cache/memory" cadvisormetrics "github.com/google/cadvisor/container" "github.com/google/cadvisor/events"