Skip to content

K
k3s
Commit 9e0c9b4f authored by Dr. Stefan Schimanski's avatar Dr. Stefan Schimanski
Browse files
Options

Mesos: create static pod file source only for configured static pods

The file source was created even when no static pods were configured. In this case it was never marked as seen. As a consequence the kubelet syncPods functions never deleted pods because it was too cautious due an unseen pod source, leading to leaked pods.
parent ebeb1044
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
contrib/mesos/pkg/executor/service/service.go
View file @ 9e0c9b4f
...@@ -387,8 +387,10 @@ func (ks *KubeletExecutorServer) createAndInitKubelet( ...@@ -387,8 +387,10 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
StaticPodsConfigPath: staticPodsConfigPath, StaticPodsConfigPath: staticPodsConfigPath,
}) })
fileSourceUpdates := pc.Channel(kubelet.FileSource)
go exec.InitializeStaticPodsSource(func() { go exec.InitializeStaticPodsSource(func() {
// Create file source only when we are called back. Otherwise, it is never marked unseen.
fileSourceUpdates := pc.Channel(kubelet.FileSource)
kconfig.NewSourceFile(staticPodsConfigPath, kc.Hostname, kc.FileCheckFrequency, fileSourceUpdates) kconfig.NewSourceFile(staticPodsConfigPath, kc.Hostname, kc.FileCheckFrequency, fileSourceUpdates)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment