github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103069 from jackfrancis/cmd-kubelet-kubeserver-new-main-kubelet

Browse Source 
chore(kubelet): simpler createAndInitKubelet func
This commit is contained in:
Kubernetes Prow Robot 2022-07-29 14:29:12 -07:00 committed by GitHub
commit c809129f2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
cmd/kubelet/app/server.go
View File

@ -41,7 +41,6 @@ import (
cadvisorapi "github.com/google/cadvisor/info/v1" cadvisorapi "github.com/google/cadvisor/info/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
@ -1128,35 +1127,12 @@ func RunKubelet(kubeServer *options.KubeletServer, kubeDeps *kubelet.Dependencie
return fmt.Errorf("the SeccompDefault feature gate must be enabled in order to use the SeccompDefault configuration") return fmt.Errorf("the SeccompDefault feature gate must be enabled in order to use the SeccompDefault configuration")
} }
k, err := createAndInitKubelet(&kubeServer.KubeletConfiguration, k, err := createAndInitKubelet(kubeServer,
kubeDeps, kubeDeps,
&kubeServer.ContainerRuntimeOptions,
hostname, hostname,
hostnameOverridden, hostnameOverridden,
nodeName, nodeName,
nodeIPs, nodeIPs)
kubeServer.ProviderID,
kubeServer.CloudProvider,
kubeServer.CertDirectory,
kubeServer.RootDirectory,
kubeServer.ImageCredentialProviderConfigFile,
kubeServer.ImageCredentialProviderBinDir,
kubeServer.RegisterNode,
kubeServer.RegisterWithTaints,
kubeServer.AllowedUnsafeSysctls,
kubeServer.ExperimentalMounterPath,
kubeServer.KernelMemcgNotification,
kubeServer.ExperimentalNodeAllocatableIgnoreEvictionThreshold,
kubeServer.MinimumGCAge,
kubeServer.MaxPerPodContainerCount,
kubeServer.MaxContainerCount,
kubeServer.MasterServiceNamespace,
kubeServer.RegisterSchedulable,
kubeServer.KeepTerminatedPodVolumes,
kubeServer.NodeLabels,
kubeServer.NodeStatusMaxImages,
kubeServer.KubeletFlags.SeccompDefault || kubeServer.KubeletConfiguration.SeccompDefault,
)
if err != nil { if err != nil {
return fmt.Errorf("failed to create kubelet: %w", err) return fmt.Errorf("failed to create kubelet: %w", err)
} }
@ -1201,67 +1177,43 @@ func startKubelet(k kubelet.Bootstrap, podCfg *config.PodConfig, kubeCfg *kubele
} }
} }
func createAndInitKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, func createAndInitKubelet(kubeServer *options.KubeletServer,
kubeDeps *kubelet.Dependencies, kubeDeps *kubelet.Dependencies,
crOptions *config.ContainerRuntimeOptions,
hostname string, hostname string,
hostnameOverridden bool, hostnameOverridden bool,
nodeName types.NodeName, nodeName types.NodeName,
nodeIPs []net.IP, nodeIPs []net.IP) (k kubelet.Bootstrap, err error) {
providerID string,
cloudProvider string,
certDirectory string,
rootDirectory string,
imageCredentialProviderConfigFile string,
imageCredentialProviderBinDir string,
registerNode bool,
registerWithTaints []v1.Taint,
allowedUnsafeSysctls []string,
experimentalMounterPath string,
kernelMemcgNotification bool,
experimentalNodeAllocatableIgnoreEvictionThreshold bool,
minimumGCAge metav1.Duration,
maxPerPodContainerCount int32,
maxContainerCount int32,
masterServiceNamespace string,
registerSchedulable bool,
keepTerminatedPodVolumes bool,
nodeLabels map[string]string,
nodeStatusMaxImages int32,
seccompDefault bool,
) (k kubelet.Bootstrap, err error) {
// TODO: block until all sources have delivered at least one update to the channel, or break the sync loop // TODO: block until all sources have delivered at least one update to the channel, or break the sync loop
// up into "per source" synchronizations // up into "per source" synchronizations
k, err = kubelet.NewMainKubelet(kubeCfg, k, err = kubelet.NewMainKubelet(&kubeServer.KubeletConfiguration,
kubeDeps, kubeDeps,
crOptions, &kubeServer.ContainerRuntimeOptions,
hostname, hostname,
hostnameOverridden, hostnameOverridden,
nodeName, nodeName,
nodeIPs, nodeIPs,
providerID, kubeServer.ProviderID,
cloudProvider, kubeServer.CloudProvider,
certDirectory, kubeServer.CertDirectory,
rootDirectory, kubeServer.RootDirectory,
imageCredentialProviderConfigFile, kubeServer.ImageCredentialProviderConfigFile,
imageCredentialProviderBinDir, kubeServer.ImageCredentialProviderBinDir,
registerNode, kubeServer.RegisterNode,
registerWithTaints, kubeServer.RegisterWithTaints,
allowedUnsafeSysctls, kubeServer.AllowedUnsafeSysctls,
experimentalMounterPath, kubeServer.ExperimentalMounterPath,
kernelMemcgNotification, kubeServer.KernelMemcgNotification,
experimentalNodeAllocatableIgnoreEvictionThreshold, kubeServer.ExperimentalNodeAllocatableIgnoreEvictionThreshold,
minimumGCAge, kubeServer.MinimumGCAge,
maxPerPodContainerCount, kubeServer.MaxPerPodContainerCount,
maxContainerCount, kubeServer.MaxContainerCount,
masterServiceNamespace, kubeServer.MasterServiceNamespace,
registerSchedulable, kubeServer.RegisterSchedulable,
keepTerminatedPodVolumes, kubeServer.KeepTerminatedPodVolumes,
nodeLabels, kubeServer.NodeLabels,
nodeStatusMaxImages, kubeServer.NodeStatusMaxImages,
seccompDefault, kubeServer.KubeletFlags.SeccompDefault || kubeServer.KubeletConfiguration.SeccompDefault)
)
if err != nil { if err != nil {
return nil, err return nil, err
} }