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

Bump pause image to 3.2 #3120

Merged
merged 2 commits into from
Feb 17, 2021
Merged

Bump pause image to 3.2 #3120

merged 2 commits into from
Feb 17, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'salt'

Context:

Invalid pause image version injected in containerd

Summary:

  • Rewrite a bit the pause injection
  • Bump pause image to 3.2

@TeddyAndrieux
salt: Make pause image loading simpler
f7a66e2 
Instead of copying the pause archive manually and then loading it, use
salt command `cp.cache_file` inside the salt state to load the pause
archive `containerd.image_managed`
@TeddyAndrieux TeddyAndrieux added kind:bug Something isn't working complexity:easy Something that requires less than a day to fix release:blocker An issue that blocks a release until resolved priority:high High priority issues, should be worked on ASAP (after urgent issues), not postponed labels Feb 16, 2021
@TeddyAndrieux TeddyAndrieux requested a review from a team February 16, 2021 14:14
@bert-e
Copy link
Contributor

bert-e commented Feb 16, 2021

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
Copy link
Contributor

bert-e commented Feb 16, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/2.8/bugfix/bump-pause-image with contents from bugfix/bump-pause-image
and development/2.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.8/bugfix/bump-pause-image origin/development/2.8
 $ git merge origin/bugfix/bump-pause-image
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.8/bugfix/bump-pause-image

NicolasT
NicolasT reviewed Feb 16, 2021
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@TeddyAndrieux TeddyAndrieux marked this pull request as ready for review February 16, 2021 15:52
@bert-e
Copy link
Contributor

bert-e commented Feb 16, 2021

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
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Feb 17, 2021

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 options are set: approve

gdemonet
gdemonet approved these changes Feb 17, 2021
View reviewed changes
Copy link
Contributor

@gdemonet gdemonet left a comment

Choose a reason for hiding this comment

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

Changes look good to me, will try to upgrade a fully offline 2.6.0 with this and come back to you

@bert-e
Copy link
Contributor

bert-e commented Feb 17, 2021

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
Copy link
Contributor

bert-e commented Feb 17, 2021

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.

@bert-e bert-e merged commit 8d95aa5 into development/2.7 Feb 17, 2021
@bert-e bert-e deleted the bugfix/bump-pause-image branch February 17, 2021 10:58
@alexandre-allard alexandre-allard mentioned this pull request Feb 25, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NicolasT NicolasT NicolasT left review comments

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
complexity:easy Something that requires less than a day to fix kind:bug Something isn't working priority:high High priority issues, should be worked on ASAP (after urgent issues), not postponed release:blocker An issue that blocks a release until resolved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@TeddyAndrieux @bert-e @NicolasT @gdemonet