Ensure containerd is ready before importing container image #3020

TeddyAndrieux · 2021-01-08T17:15:01Z

Component:

'salt'

Context:

Time to time importing of pause image fail because containerd just get upgraded and not fully restarted

         ID: Inject pause image
    Function: containerd.image_managed
        Name: k8s.gcr.io/pause:3.1
      Result: False
     Comment: Failed to import archive: time="2021-01-08T10:22:26+01:00" level=debug msg="unpacking 1 images"
     Started: 10:22:26.698077
    Duration: 168.411 ms
     Changes:

Summary:

Add a salt module to check for container engine to be ready (using crictl version)
Make sure container engine is ready before importing pause image
Make sure container engine is ready before importing nginx image

bert-e · 2021-01-08T17:15:03Z

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-01-08T17:15:11Z

Integration data created

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

this pull request will merge bugfix/wait-after-containerd-restart into
development/2.7
w/2.8/bugfix/wait-after-containerd-restart will be merged into development/2.8

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6

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-01-08T17:15:12Z

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:

bert-e · 2021-01-08T17:15:38Z

History mismatch

Merge commit #776e88496360be0b9502880193251bb2e0dd8989 on the integration branch
w/2.8/bugfix/wait-after-containerd-restart is merging a branch which is neither the current
branch bugfix/wait-after-containerd-restart nor the development branch
development/2.8.

It is likely due to a rebase of the branch bugfix/wait-after-containerd-restart 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.

bert-e · 2021-01-08T17:16:31Z

History mismatch

Merge commit #04919ccaeec9df0bbb2c99721b36aef94a095daf on the integration branch
w/2.8/bugfix/wait-after-containerd-restart is merging a branch which is neither the current
branch bugfix/wait-after-containerd-restart nor the development branch
development/2.8.

It is likely due to a rebase of the branch bugfix/wait-after-containerd-restart 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-01-08T17:18:28Z

/reset

bert-e · 2021-01-08T17:18:36Z

Reset complete

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

bert-e · 2021-01-08T17:18:44Z

Integration data created

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

this pull request will merge bugfix/wait-after-containerd-restart into
development/2.7
w/2.8/bugfix/wait-after-containerd-restart will be merged into development/2.8

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6

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-01-08T17:18:45Z

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:

NicolasT · 2021-01-08T17:42:12Z

salt/metalk8s/container-engine/containerd/running.sls

+    - init_delay: 2
+
+Ensure containerd is ready:
+  test.configurable_test_state:


Any reason cri.ready is not implemented as some module?

Would need to create a state module in addition to wrap this call. Using slots looks simpler to me :)

WDYM ? As a salt state module ?

For me, since it's something that does not change anything on the machine we do not want to have a salt state module for this.

salt/metalk8s/repo/installed.sls

NicolasT

I believe there's a little bug (likely not something we'd ever run into, but still).

bert-e · 2021-01-08T17:45: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:

The following reviewers are expecting changes from the author, or must review again:

@NicolasT

NicolasT · 2021-01-08T17:47:20Z

Is this in any way related to #2960 ?

TeddyAndrieux · 2021-01-08T18:12:38Z

I believe there's a little bug (likely not something we'd ever run into, but still).

Ups, I forgot to add the new sls in the iso 😄

Is this in any way related to #2960 ?

Yep I will close this one

bert-e · 2021-01-08T18:15:11Z

History mismatch

Merge commit #76ac91d9b1c30fe606b85b1973107291020c37e3 on the integration branch
w/2.8/bugfix/wait-after-containerd-restart is merging a branch which is neither the current
branch bugfix/wait-after-containerd-restart nor the development branch
development/2.8.

It is likely due to a rebase of the branch bugfix/wait-after-containerd-restart 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-01-08T18:21:12Z

/reset

bert-e · 2021-01-08T18:21:20Z

Reset complete

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

bert-e · 2021-01-08T18:21:28Z

Integration data created

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

this pull request will merge bugfix/wait-after-containerd-restart into
development/2.7
w/2.8/bugfix/wait-after-containerd-restart will be merged into development/2.8

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6

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-01-08T18:21:30Z

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:

The following reviewers are expecting changes from the author, or must review again:

@NicolasT

bert-e · 2021-01-08T19:31:19Z

History mismatch

Merge commit #43d371ede0d1f8bb8ef67dc471d7babb382b352f on the integration branch
w/2.8/bugfix/wait-after-containerd-restart is merging a branch which is neither the current
branch bugfix/wait-after-containerd-restart nor the development branch
development/2.8.

It is likely due to a rebase of the branch bugfix/wait-after-containerd-restart 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.

Add a salt state to ensure containerd is running and reachable with crictl. So when we try to import the pause image we are sure containerd is ready

In repo salt state we import the nginx image before creating the repository manifest. Add a requisite to make the container engine is ready before importing this nginx container image

TeddyAndrieux · 2021-01-08T21:41:36Z

/reset

bert-e · 2021-01-08T21:41:44Z

Reset complete

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

bert-e · 2021-01-08T21:41:53Z

Integration data created

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

this pull request will merge bugfix/wait-after-containerd-restart into
development/2.7
w/2.8/bugfix/wait-after-containerd-restart will be merged into development/2.8

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6

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-01-08T21:41:54Z

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:

The following reviewers are expecting changes from the author, or must review again:

@NicolasT

salt/metalk8s/container-engine/containerd/installed.sls

gdemonet

LGTM

TeddyAndrieux · 2021-01-11T21:49:25Z

/approve

bert-e · 2021-01-11T21:49:32Z

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:

The following reviewers are expecting changes from the author, or must review again:

@NicolasT

The following options are set: approve

Fixed

bert-e · 2021-01-11T21:49:52Z

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.7
✔️ development/2.8

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6

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-01-11T23:30:14Z

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

✔️ development/2.7
✔️ development/2.8

The following branches have NOT changed:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6

Please check the status of the associated issue None.

Goodbye teddyandrieux.

TeddyAndrieux added kind:bug Something isn't working complexity:easy Something that requires less than a day to fix topic:salt Everything related to SaltStack in our product labels Jan 8, 2021

TeddyAndrieux requested a review from a team January 8, 2021 17:15

TeddyAndrieux force-pushed the bugfix/wait-after-containerd-restart branch from 776e884 to c08067d Compare January 8, 2021 17:15

TeddyAndrieux force-pushed the bugfix/wait-after-containerd-restart branch from c08067d to 0da6de4 Compare January 8, 2021 17:16

TeddyAndrieux force-pushed the bugfix/wait-after-containerd-restart branch from 0da6de4 to 0914eac Compare January 8, 2021 17:17

gdemonet previously approved these changes Jan 8, 2021

View reviewed changes

NicolasT reviewed Jan 8, 2021

View reviewed changes

salt/metalk8s/repo/installed.sls Outdated Show resolved Hide resolved

NicolasT previously requested changes Jan 8, 2021

View reviewed changes

TeddyAndrieux dismissed gdemonet’s stale review via 3b869e1 January 8, 2021 18:15

TeddyAndrieux force-pushed the bugfix/wait-after-containerd-restart branch from 0914eac to 3b869e1 Compare January 8, 2021 18:15

TeddyAndrieux requested review from gdemonet and NicolasT January 8, 2021 18:23

TeddyAndrieux mentioned this pull request Jan 8, 2021

salt: Add missing requisite for image injection #2960

Closed

TeddyAndrieux force-pushed the bugfix/wait-after-containerd-restart branch from 3b869e1 to 03f8a68 Compare January 8, 2021 19:31

TeddyAndrieux added 3 commits January 8, 2021 21:31

salt: Ensure containerd is ready and reachable with crictl

5e1a1a2

Add a salt state to ensure containerd is running and reachable with crictl. So when we try to import the pause image we are sure containerd is ready

salt: Make sure container engine is ready before importing nginx

18cc26a

In repo salt state we import the nginx image before creating the repository manifest. Add a requisite to make the container engine is ready before importing this nginx container image

changelog: Add entry about check for container engine to be ready

419fb64

TeddyAndrieux force-pushed the bugfix/wait-after-containerd-restart branch from 03f8a68 to 419fb64 Compare January 8, 2021 20:31

NicolasT reviewed Jan 9, 2021

View reviewed changes

salt/metalk8s/container-engine/containerd/installed.sls Show resolved Hide resolved

salt/metalk8s/container-engine/containerd/installed.sls Show resolved Hide resolved

salt/metalk8s/container-engine/containerd/installed.sls Show resolved Hide resolved

gdemonet approved these changes Jan 11, 2021

View reviewed changes

bert-e merged commit c3f6be7 into development/2.7 Jan 11, 2021

bert-e deleted the bugfix/wait-after-containerd-restart branch January 11, 2021 23:30

TeddyAndrieux mentioned this pull request Feb 22, 2021

containerd isn't restarted when config changed #3129

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ensure containerd is ready before importing container image #3020

Ensure containerd is ready before importing container image #3020

TeddyAndrieux commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

TeddyAndrieux commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

NicolasT Jan 8, 2021

gdemonet Jan 8, 2021

TeddyAndrieux Jan 8, 2021 •

edited

Loading

NicolasT left a comment

bert-e commented Jan 8, 2021

NicolasT commented Jan 8, 2021

TeddyAndrieux commented Jan 8, 2021 •

edited

Loading

bert-e commented Jan 8, 2021

TeddyAndrieux commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

TeddyAndrieux commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

bert-e commented Jan 8, 2021

gdemonet left a comment

TeddyAndrieux commented Jan 11, 2021

bert-e commented Jan 11, 2021

bert-e commented Jan 11, 2021

bert-e commented Jan 11, 2021

Ensure containerd is ready before importing container image #3020

Ensure containerd is ready before importing container image #3020

Conversation

TeddyAndrieux commented Jan 8, 2021

bert-e commented Jan 8, 2021

Hello teddyandrieux,

bert-e commented Jan 8, 2021

Integration data created

bert-e commented Jan 8, 2021

Waiting for approval

bert-e commented Jan 8, 2021

History mismatch

bert-e commented Jan 8, 2021

History mismatch

TeddyAndrieux commented Jan 8, 2021

bert-e commented Jan 8, 2021

Reset complete

bert-e commented Jan 8, 2021

Integration data created

bert-e commented Jan 8, 2021

Waiting for approval

NicolasT Jan 8, 2021

Choose a reason for hiding this comment

gdemonet Jan 8, 2021

Choose a reason for hiding this comment

TeddyAndrieux Jan 8, 2021 • edited Loading

Choose a reason for hiding this comment

NicolasT left a comment

Choose a reason for hiding this comment

bert-e commented Jan 8, 2021

Waiting for approval

NicolasT commented Jan 8, 2021

TeddyAndrieux commented Jan 8, 2021 • edited Loading

bert-e commented Jan 8, 2021

History mismatch

TeddyAndrieux commented Jan 8, 2021

bert-e commented Jan 8, 2021

Reset complete

bert-e commented Jan 8, 2021

Integration data created

bert-e commented Jan 8, 2021

Waiting for approval

bert-e commented Jan 8, 2021

History mismatch

TeddyAndrieux commented Jan 8, 2021

bert-e commented Jan 8, 2021

Reset complete

bert-e commented Jan 8, 2021

Integration data created

bert-e commented Jan 8, 2021

Waiting for approval

gdemonet left a comment

Choose a reason for hiding this comment

TeddyAndrieux commented Jan 11, 2021

bert-e commented Jan 11, 2021

Waiting for approval

bert-e commented Jan 11, 2021

In the queue

bert-e commented Jan 11, 2021

TeddyAndrieux Jan 8, 2021 •

edited

Loading

TeddyAndrieux commented Jan 8, 2021 •

edited

Loading