Skip to content

set FileCheckFrequency default properly #20158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2018
Merged

set FileCheckFrequency default properly #20158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions pkg/cmd/server/kubernetes/node/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ func ComputeKubeletFlags(startingArgs map[string][]string, options configapi.Nod
imageTemplate.Format = options.ImageConfig.Format
imageTemplate.Latest = options.ImageConfig.Latest

path := ""
var fileCheckInterval int64
if options.PodManifestConfig != nil {
path = options.PodManifestConfig.Path
fileCheckInterval = options.PodManifestConfig.FileCheckIntervalSeconds
setIfUnset(args, "pod-manifest-path", options.PodManifestConfig.Path)
setIfUnset(args, "file-check-frequency", fmt.Sprintf("%ds", options.PodManifestConfig.FileCheckIntervalSeconds))
}
kubeAddressStr, kubePortStr, err := net.SplitHostPort(options.ServingInfo.BindAddress)
if err != nil {
Expand All @@ -44,7 +42,6 @@ func ComputeKubeletFlags(startingArgs map[string][]string, options configapi.Nod
setIfUnset(args, "address", kubeAddressStr)
setIfUnset(args, "port", kubePortStr)
setIfUnset(args, "kubeconfig", options.MasterKubeConfig)
setIfUnset(args, "pod-manifest-path", path)
setIfUnset(args, "root-dir", options.VolumeDirectory)
setIfUnset(args, "node-ip", options.NodeIP)
setIfUnset(args, "hostname-override", options.NodeName)
Expand All @@ -61,7 +58,6 @@ func ComputeKubeletFlags(startingArgs map[string][]string, options configapi.Nod
setIfUnset(args, "host-pid-sources", "api", "file")
setIfUnset(args, "host-ipc-sources", "api", "file")
setIfUnset(args, "http-check-frequency", "0s") // no remote HTTP pod creation access
setIfUnset(args, "file-check-frequency", fmt.Sprintf("%ds", fileCheckInterval))
setIfUnset(args, "pod-infra-container-image", imageTemplate.ExpandOrDie("pod"))
setIfUnset(args, "max-pods", "250")
setIfUnset(args, "cgroup-driver", "systemd")
Expand Down