Merge pull request openshift#1838 from openshift-cherrypick-robot/che…

…rry-pick-1784-to-release-4.4 [release-4.4] Bug 1848021: Set the pod-infra-container-image flag in kubelet to ocp pause image
mtrmac · Jun 19, 2020 · cba4bab · cba4bab
2 parents b2d3330 + 7a91aaa
commit cba4bab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/templates/master/01-master-kubelet/_base/units/kubelet.yaml b/templates/master/01-master-kubelet/_base/units/kubelet.yaml
@@ -32,6 +32,7 @@ contents: |
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         {{cloudConfigFlag . }} \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
+        --pod-infra-container-image={{.Images.infraImageKey}} \
         --v=${KUBELET_LOG_LEVEL}
 
   Restart=always

diff --git a/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml b/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml
@@ -31,6 +31,7 @@ contents: |
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --cloud-provider={{cloudProvider .}} \
         {{cloudConfigFlag . }} \
+        --pod-infra-container-image={{.Images.infraImageKey}} \
         --v=${KUBELET_LOG_LEVEL}
 
   Restart=always