Skip to content
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

Jump to bottom

Bug 1823967: Add the --pod-infra-container-image flag to the kubelet service #3712

Merged
merged 1 commit into from Jun 9, 2020
Merged

Bug 1823967: Add the --pod-infra-container-image flag to the kubelet service #3712

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions data/data/bootstrap/files/usr/local/bin/kubelet-pause-image.sh.template
View file
Open in desktop
@@ -0,0 +1,10 @@
#!/usr/bin/env bash
set -euo pipefail
# Before kubelet.service and crio.service start, ensure
# that we're using the pause image from our payload just like the primary cluster.
# Need to set the --pod-infra-container-image flag for the kubelet to point to the pause image from the payload
# So we add MACHINE_CONFIG_INFRA_IMAGE to an environment file and source that in the kubelet service

. /usr/local/bin/release-image.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this to correctly load/finish requires that release image has been downloaded by the release-image.service unit.

How will we ensure that kubelet waits or keeps retrying until I that unit suceeds.
If there is a failure will kubelet service retry or just fail and sit

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kubelet can't start until crio has been started. And https://github.com/openshift/installer/blob/master/data/data/bootstrap/systemd/units/crio-configure.service.template#L5 ensures that the release image has been downloaded before crio is started.
But to make sure, I can add After/Wants=release-image.service to the kubelet service here https://github.com/openshift/installer/pull/3712/files#diff-367cd6ecdc6c4f5bbe9560468fad15f3R4 as well to ensure you can't start kubelet till release-image.service has been successful. Wdyt?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added release-image.service to After and Wants in the kubelet service template below.


echo "MACHINE_CONFIG_INFRA_IMAGE=$(image_for pod)" > /etc/kubernetes/kubelet-pause-image-override
9 changes: 6 additions & 3 deletions data/data/bootstrap/systemd/units/kubelet.service.template
View file
Open in desktop
@@ -1,14 +1,16 @@
[Unit]
Description=Kubernetes Kubelet
Wants=rpc-statd.service crio.service
After=crio.service
Wants=rpc-statd.service crio.service release-image.service
After=crio.service release-image.service

[Service]
Type=notify
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/kubelet-plugins/volume/exec
ExecStartPre=/usr/local/bin/kubelet-pause-image.sh
Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m
EnvironmentFile=-/etc/kubernetes/kubelet-env
EnvironmentFile=-/etc/kubernetes/kubelet-pause-image-override

ExecStart=/usr/bin/hyperkube \
kubelet \
Expand All @@ -21,7 +23,8 @@ ExecStart=/usr/bin/hyperkube \
--cgroup-driver=systemd \
--serialize-image-pulls=false \
--v=2 \
--volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec
--volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
--pod-infra-container-image=${MACHINE_CONFIG_INFRA_IMAGE}

Restart=always
RestartSec=10
Expand Down