mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Merge pull request #47896 from NickrenREN/makeEventRecorder-cleanup
Automatic merge from submit-queue (batch tested with PRs 47896, 50678, 50620, 50631, 51005) MakeEventRecorder function cleanup delete KubeletConfiguration arg since it is unused fixes #50969 ```release-note NONE ```
This commit is contained in:
commit
5b159fa750
@ -205,7 +205,7 @@ func initConfigz(kc *kubeletconfiginternal.KubeletConfiguration) (*configz.Confi
|
|||||||
}
|
}
|
||||||
|
|
||||||
// makeEventRecorder sets up kubeDeps.Recorder if its nil. Its a no-op otherwise.
|
// makeEventRecorder sets up kubeDeps.Recorder if its nil. Its a no-op otherwise.
|
||||||
func makeEventRecorder(s *kubeletconfiginternal.KubeletConfiguration, kubeDeps *kubelet.Dependencies, nodeName types.NodeName) {
|
func makeEventRecorder(kubeDeps *kubelet.Dependencies, nodeName types.NodeName) {
|
||||||
if kubeDeps.Recorder != nil {
|
if kubeDeps.Recorder != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -384,7 +384,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies) (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Setup event recorder if required.
|
// Setup event recorder if required.
|
||||||
makeEventRecorder(&s.KubeletConfiguration, kubeDeps, nodeName)
|
makeEventRecorder(kubeDeps, nodeName)
|
||||||
|
|
||||||
if kubeDeps.ContainerManager == nil {
|
if kubeDeps.ContainerManager == nil {
|
||||||
if s.CgroupsPerQOS && s.CgroupRoot == "" {
|
if s.CgroupsPerQOS && s.CgroupRoot == "" {
|
||||||
@ -616,7 +616,7 @@ func RunKubelet(kubeFlags *options.KubeletFlags, kubeCfg *kubeletconfiginternal.
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// Setup event recorder if required.
|
// Setup event recorder if required.
|
||||||
makeEventRecorder(kubeCfg, kubeDeps, nodeName)
|
makeEventRecorder(kubeDeps, nodeName)
|
||||||
|
|
||||||
// TODO(mtaufen): I moved the validation of these fields here, from UnsecuredKubeletConfig,
|
// TODO(mtaufen): I moved the validation of these fields here, from UnsecuredKubeletConfig,
|
||||||
// so that I could remove the associated fields from KubeletConfiginternal. I would
|
// so that I could remove the associated fields from KubeletConfiginternal. I would
|
||||||
|
Loading…
Reference in New Issue
Block a user