-
Notifications
You must be signed in to change notification settings - Fork 45
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.
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
Marks pause
image as pod infra container image in kubelet (and only use image from embedded repos
#3624
Conversation
Hello teddyandrieux,My role is to assist you with the merge of this Status report is not available. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
6ec3ed3
to
40a05b8
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
40a05b8
to
d84abec
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
You can set option
|
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
|
pause
image as pod infra container image in kubelet (and only use image from embedded repospause
image as pod infra container image in kubelet (and only use image from embedded repos
if fullname: | ||
cmd += ' --index-name "{}"'.format(fullname) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this needed whilst it wasn't before?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's to import an index name for the image, it was not needed before because we used the repo in the "repositories" file in the tar archive
# cat repositories
{"k8s.gcr.io/pause":{"3.2":"a38657cdc544bd8c100ef952fc60e31709509b0bc4f31804ab107fe7fd0e6f4a"}}
So several options:
1- At build time we put the right repo in the tar for the image (which mean we "compute" the repository name at build time, where today it's at run time in salt)
2- At run time we create the tar file containing the right repositories
file with the repo (it's a bit of work...)
3- We use --index-name
so that in the cache we have an index on the pause image
I choose the last option as it was the simplest to do, but we can still change this if we need to
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, thanks for explaining. Maybe consider putting such intel in commit message in the future :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right
We marks the `pause` image used by `containerd` as `pod infra container image` for kubelet, so that kubelet does not remove this image. We also put `pause` image in the embedded registry, so that we are sure that node does not fetch this image from the internet. NOTE: Since we fetch the pause image from the embedded registry we no longer need to import it manually with salt on every node but only for the registry node Fixes: #3601
d84abec
to
bef4690
Compare
History mismatchMerge commit #7a1fde5c906bf0361e541e022307b3d83da21c5a on the integration branch It is likely due to a rebase of the branch Please use the |
/reset |
Reset completeI have successfully deleted this pull request's integration branches. |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
You can set option
|
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
|
/approve |
In the queueThe changeset has received all authorizations and has been added to the The changeset will be merged in:
The following branches will NOT be impacted:
There is no action required on your side. You will be notified here once IMPORTANT Please do not attempt to modify this pull request.
If you need this pull request to be removed from the queue, please contact a The following options are set: approve |
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue None. Goodbye teddyandrieux. |
We mark the
pause
image used by containerD aspod infra container image
for kubelet, so that kubelet does not remove this image.We also put
pause
andnginx
images (used by the registry pod) in the embedded registry,so that we are sure that the node does not fetch this image from the internet.
NOTE: Since we fetch the pause image from the embedded registry we no
longer need to import it manually with salt on every node but only for
the registry node.
Fixes: #3601