Marks `pause` image as pod infra container image in kubelet (and only use image from embedded repos #3624

TeddyAndrieux · 2021-12-02T09:21:48Z

We mark 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 and nginx 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

bert-e · 2021-12-02T09:21:50Z

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2021-12-02T09:26:02Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/do-not-evict-pause-image into
development/2.11
w/123.0/bugfix/do-not-evict-pause-image will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-12-02T09:26:04Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

CHANGELOG.md

NicolasT · 2021-12-02T11:06:06Z

salt/_modules/containerd.py

+    if fullname:
+        cmd += ' --index-name "{}"'.format(fullname)


Why is this needed whilst it wasn't before?

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

OK, thanks for explaining. Maybe consider putting such intel in commit message in the future :)

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

bert-e · 2021-12-02T12:52:22Z

History mismatch

Merge commit #7a1fde5c906bf0361e541e022307b3d83da21c5a on the integration branch
w/123.0/bugfix/do-not-evict-pause-image is merging a branch which is neither the current
branch bugfix/do-not-evict-pause-image nor the development branch
development/123.0.

It is likely due to a rebase of the branch bugfix/do-not-evict-pause-image and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

TeddyAndrieux · 2021-12-02T12:52:27Z

/reset

bert-e · 2021-12-02T12:52:32Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2021-12-02T12:52:38Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/do-not-evict-pause-image into
development/2.11
w/123.0/bugfix/do-not-evict-pause-image will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-12-02T12:52:39Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

TeddyAndrieux · 2021-12-02T15:09:09Z

/approve

bert-e · 2021-12-02T15:34:07Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/2.11
✔️ development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2021-12-02T15:34:14Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/2.11
✔️ development/123.0

The following branches have NOT changed:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

TeddyAndrieux requested a review from a team December 2, 2021 09:21

This comment has been minimized.

Sign in to view

TeddyAndrieux force-pushed the bugfix/do-not-evict-pause-image branch from 6ec3ed3 to 40a05b8 Compare December 2, 2021 09:22

This comment has been minimized.

Sign in to view

TeddyAndrieux force-pushed the bugfix/do-not-evict-pause-image branch from 40a05b8 to d84abec Compare December 2, 2021 09:24

This comment has been minimized.

Sign in to view

TeddyAndrieux changed the title ~~Mark pause image as pod infra container image in kubelet (and only use image from embedded repos~~ Marks pause image as pod infra container image in kubelet (and only use image from embedded repos Dec 2, 2021

NicolasT reviewed Dec 2, 2021

View reviewed changes

TeddyAndrieux added 3 commits December 2, 2021 13:52

salt: Use internal repo for registry image

9521d0c

salt: Add ability to set index name for imported image with ctr

53270c0

TeddyAndrieux force-pushed the bugfix/do-not-evict-pause-image branch from d84abec to bef4690 Compare December 2, 2021 12:52

NicolasT approved these changes Dec 2, 2021

View reviewed changes

bert-e merged commit bef4690 into development/2.11 Dec 2, 2021

bert-e deleted the bugfix/do-not-evict-pause-image branch December 2, 2021 15:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Marks `pause` image as pod infra container image in kubelet (and only use image from embedded repos #3624

Marks `pause` image as pod infra container image in kubelet (and only use image from embedded repos #3624

TeddyAndrieux commented Dec 2, 2021

bert-e commented Dec 2, 2021

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.

bert-e commented Dec 2, 2021

bert-e commented Dec 2, 2021

NicolasT Dec 2, 2021

TeddyAndrieux Dec 2, 2021 •

edited

Loading

NicolasT Dec 2, 2021

TeddyAndrieux Dec 2, 2021

bert-e commented Dec 2, 2021

TeddyAndrieux commented Dec 2, 2021

bert-e commented Dec 2, 2021

bert-e commented Dec 2, 2021

bert-e commented Dec 2, 2021

TeddyAndrieux commented Dec 2, 2021

bert-e commented Dec 2, 2021

bert-e commented Dec 2, 2021

Marks pause image as pod infra container image in kubelet (and only use image from embedded repos #3624

Marks pause image as pod infra container image in kubelet (and only use image from embedded repos #3624

Conversation

TeddyAndrieux commented Dec 2, 2021

bert-e commented Dec 2, 2021

Hello teddyandrieux,

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.

bert-e commented Dec 2, 2021

Integration data created

bert-e commented Dec 2, 2021

Waiting for approval

NicolasT Dec 2, 2021

Choose a reason for hiding this comment

TeddyAndrieux Dec 2, 2021 • edited Loading

Choose a reason for hiding this comment

NicolasT Dec 2, 2021

Choose a reason for hiding this comment

TeddyAndrieux Dec 2, 2021

Choose a reason for hiding this comment

bert-e commented Dec 2, 2021

History mismatch

TeddyAndrieux commented Dec 2, 2021

bert-e commented Dec 2, 2021

Reset complete

bert-e commented Dec 2, 2021

Integration data created

bert-e commented Dec 2, 2021

Waiting for approval

TeddyAndrieux commented Dec 2, 2021

bert-e commented Dec 2, 2021

In the queue

bert-e commented Dec 2, 2021

Marks `pause` image as pod infra container image in kubelet (and only use image from embedded repos #3624

Marks `pause` image as pod infra container image in kubelet (and only use image from embedded repos #3624

TeddyAndrieux Dec 2, 2021 •

edited

Loading