github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99476 from neolit123/1.21-pass-pod-infra-to-all-cr

Browse Source 
kubeadm: pass pod-infra-container-image for all CRs
This commit is contained in:
Kubernetes Prow Robot 2021-02-25 17:42:15 -08:00 committed by GitHub
commit 3abeb174c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubeadm/app/phases/kubelet/flags.go
View File

@ -79,14 +79,17 @@ func buildKubeletArgMapCommon(opts kubeletFlagsOpts) map[string]string {
if opts.nodeRegOpts.CRISocket == constants.DefaultDockerCRISocket { if opts.nodeRegOpts.CRISocket == constants.DefaultDockerCRISocket {
// These flags should only be set when running docker // These flags should only be set when running docker
kubeletFlags["network-plugin"] = "cni" kubeletFlags["network-plugin"] = "cni"
if opts.pauseImage != "" {
kubeletFlags["pod-infra-container-image"] = opts.pauseImage
}
} else { } else {
kubeletFlags["container-runtime"] = "remote" kubeletFlags["container-runtime"] = "remote"
kubeletFlags["container-runtime-endpoint"] = opts.nodeRegOpts.CRISocket kubeletFlags["container-runtime-endpoint"] = opts.nodeRegOpts.CRISocket
} }
// This flag passes the pod infra container image (e.g. "pause" image) to the kubelet
// and prevents its garbage collection
if opts.pauseImage != "" {
kubeletFlags["pod-infra-container-image"] = opts.pauseImage
}
if opts.registerTaintsUsingFlags && opts.nodeRegOpts.Taints != nil && len(opts.nodeRegOpts.Taints) > 0 { if opts.registerTaintsUsingFlags && opts.nodeRegOpts.Taints != nil && len(opts.nodeRegOpts.Taints) > 0 {
taintStrs := []string{} taintStrs := []string{}
for _, taint := range opts.nodeRegOpts.Taints { for _, taint := range opts.nodeRegOpts.Taints {