From ed83a54f6686a58b0d5b1a469ba8011e9bafa3c1 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Tue, 3 Jul 2018 11:18:15 -0500 Subject: [PATCH] only set PodManifestConfig flags if explicitly specified --- pkg/cmd/server/kubernetes/node/options/options.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/cmd/server/kubernetes/node/options/options.go b/pkg/cmd/server/kubernetes/node/options/options.go index 15c2554f4378..335f31aeb8f1 100644 --- a/pkg/cmd/server/kubernetes/node/options/options.go +++ b/pkg/cmd/server/kubernetes/node/options/options.go @@ -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 { @@ -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) @@ -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")