Merge pull request #1762 from openshift-cherrypick-robot/cherry-pick-…

…1761-to-release-4.1

Bug 1711844: bootkube.sh: Use pause image from payload

data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

@@ -38,6 +38,18 @@ OPENSHIFT_HYPERKUBE_IMAGE=$(podman run --quiet --rm ${release} image hyperkube)
 
 CLUSTER_BOOTSTRAP_IMAGE=$(podman run --quiet --rm ${release} image cluster-bootstrap)
 
+# Now, as early as possible we replace the pause image and reload crio to use it, to ensure
+# that we're using the pause image from our payload just like the primary cluster.
+# The config should match the one generated by the MCO ideally:
+# https://github.com/openshift/machine-config-operator/blob/e861ccb12f09c7c768d51fdf0a17879fcc9a87d5/templates/master/01-master-container-runtime/_base/files/crio.yaml
+# But for now we're just changing the key bits: image and command.
+# Perhaps down the line we change this to run something like:
+# podman run machine-config-daemon bootstrap ... (passing the release image and the host rootfs)
+sed -i -e 's,pause_image *=.*,pause_image = "'${MACHINE_CONFIG_INFRA_IMAGE}'",' /etc/crio/crio.conf
+sed -i -e 's,pause_command *=.*,pause_command = "/usr/bin/pod",' /etc/crio/crio.conf
+# Note crio today has a reload command but it just dies from the SIGHUP sent...
+systemctl restart cri-o.service
+
 mkdir --parents ./{bootstrap-manifests,manifests}
 
 if [ ! -f cvo-bootstrap.done ]