Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
d91c36e2
Commit
d91c36e2
authored
Aug 20, 2019
by
Darren Shepherd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop cloud providers
parent
2d3c76f9
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
16 additions
and
171 deletions
+16
-171
main.go
cmd/hyperkube/main.go
+0
-3
globalflags.go
cmd/kube-apiserver/app/options/globalflags.go
+0
-4
controllermanager.go
cmd/kube-controller-manager/app/controllermanager.go
+0
-4
plugins.go
cmd/kube-controller-manager/app/plugins.go
+1
-62
kubectl.go
cmd/kubectl/kubectl.go
+0
-3
globalflags.go
cmd/kubelet/app/options/globalflags.go
+0
-5
plugins.go
cmd/kubelet/app/plugins.go
+2
-40
adapter.go
pkg/controller/nodeipam/ipam/adapter.go
+3
-4
cidr_allocator.go
pkg/controller/nodeipam/ipam/cidr_allocator.go
+3
-4
cloud_cidr_allocator.go
pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go
+2
-0
controller.go
pkg/controller/nodeipam/ipam/controller.go
+4
-10
node_ipam_controller.go
pkg/controller/nodeipam/node_ipam_controller.go
+1
-24
config.go
pkg/kubeapiserver/authenticator/config.go
+0
-2
cadvisor_linux.go
pkg/kubelet/cadvisor/cadvisor_linux.go
+0
-6
No files found.
cmd/hyperkube/main.go
View file @
d91c36e2
...
...
@@ -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
...
...
cmd/kube-apiserver/app/options/globalflags.go
View file @
d91c36e2
...
...
@@ -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"
)
...
...
cmd/kube-controller-manager/app/controllermanager.go
View file @
d91c36e2
...
...
@@ -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
)
}
...
...
cmd/kube-controller-manager/app/plugins.go
View file @
d91c36e2
...
...
@@ -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
()
...
)
...
...
cmd/kubectl/kubectl.go
View file @
d91c36e2
...
...
@@ -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
()
{
...
...
cmd/kubelet/app/options/globalflags.go
View file @
d91c36e2
...
...
@@ -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
)
}
...
...
cmd/kubelet/app/plugins.go
View file @
d91c36e2
...
...
@@ -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
()
...
)
}
...
...
pkg/controller/nodeipam/ipam/adapter.go
View file @
d91c36e2
// +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
()
...
...
pkg/controller/nodeipam/ipam/cidr_allocator.go
View file @
d91c36e2
...
...
@@ -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
)
}
...
...
pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go
View file @
d91c36e2
// +build deleted
/*
Copyright 2016 The Kubernetes Authors.
...
...
pkg/controller/nodeipam/ipam/controller.go
View file @
d91c36e2
// +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
,
}
...
...
pkg/controller/nodeipam/node_ipam_controller.go
View file @
d91c36e2
...
...
@@ -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
...
...
pkg/kubeapiserver/authenticator/config.go
View file @
d91c36e2
...
...
@@ -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"
...
...
pkg/kubelet/cadvisor/cadvisor_linux.go
View file @
d91c36e2
...
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment