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

feature/bump containerd version #4397

Merged
merged 1 commit into from
Aug 19, 2024
Merged

feature/bump containerd version #4397

merged 1 commit into from
Aug 19, 2024

Conversation

m4nch0t
Copy link

@m4nch0t m4nch0t commented Aug 6, 2024

No description provided.

@m4nch0t m4nch0t self-assigned this Aug 6, 2024
@bert-e
Copy link
Contributor

bert-e commented Aug 6, 2024

Hello m4nch0t,

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.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval ⭐
/bypass_build_status Bypass the build and test status ⭐
/bypass_commit_size Bypass the check on the size of the changeset TBA ⭐
/bypass_incompatible_branch Bypass the check on the source branch prefix ⭐
/bypass_jira_check Bypass the Jira issue check ⭐
/bypass_peer_approval Bypass the pull request peers' approval ⭐
/bypass_leader_approval Bypass the pull request leaders' approval ⭐
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Aug 6, 2024

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:

@m4nch0t m4nch0t changed the title Feature/bump containerd version feature/bump containerd version Aug 6, 2024
@m4nch0t m4nch0t force-pushed the feature/bump-containerd-version branch 3 times, most recently from 55e70dd to fc7f298 Compare August 7, 2024 09:27
@bert-e
Copy link
Contributor

bert-e commented Aug 7, 2024

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:

@m4nch0t m4nch0t force-pushed the feature/bump-containerd-version branch 2 times, most recently from 29e4053 to 9abaea5 Compare August 7, 2024 12:18
@m4nch0t m4nch0t marked this pull request as ready for review August 7, 2024 18:27
@m4nch0t m4nch0t requested a review from a team as a code owner August 7, 2024 18:27
ezekiel-alexrod
ezekiel-alexrod reviewed Aug 8, 2024
View reviewed changes
packages/redhat/common/containerd.spec
Comment on lines -69 to +70
Provides: bundled(golang(bazil.org/fuse)) = 5883e5a4b512
Provides: bundled(golang(cloud.google.com/go)) = v0.81.0
Provides: bundled(golang(bazil.org/fuse)) = 371fbbdaa898
Provides: bundled(golang(cloud.google.com/go)) = v0.65.0
Copy link
Contributor

Choose a reason for hiding this comment

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

The version downgrades here ?

packages/redhat/common/containerd.spec
Provides: bundled(golang(github.com/checkpoint-restore/go-criu/v5)) = v5.3.0
Provides: bundled(golang(github.com/checkpoint-restore/go-criu/v5)) = v5.0.0
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

packages/redhat/common/containerd.spec
Comment on lines -168 to +169
Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = v0.2.3
Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = v0.2.2
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

packages/redhat/common/containerd.spec
Comment on lines -232 to +234
Provides: bundled(golang(github.com/google/martian/v3)) = v3.1.0
Provides: bundled(golang(github.com/google/martian/v3)) = v3.0.0
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

packages/redhat/common/containerd.spec
Provides: bundled(golang(google.golang.org/api)) = v0.43.0
Provides: bundled(golang(google.golang.org/api)) = v0.30.0
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

@m4nch0t m4nch0t force-pushed the feature/bump-containerd-version branch from 9abaea5 to 270cd1b Compare August 12, 2024 09:37
@bert-e
Copy link
Contributor

bert-e commented Aug 12, 2024

Conflict

There is a conflict between your branch feature/bump-containerd-version and the
destination branch development/128.0.

Please resolve the conflict on the feature branch (feature/bump-containerd-version).

git fetch && \
git checkout origin/feature/bump-containerd-version && \
git merge origin/development/128.0

Resolve merge conflicts and commit

git push origin HEAD:feature/bump-containerd-version

@m4nch0t m4nch0t force-pushed the feature/bump-containerd-version branch 2 times, most recently from dd60261 to 8c2aaa6 Compare August 13, 2024 09:14
@m4nch0t
Copy link
Author

m4nch0t commented Aug 16, 2024

/approve

@bert-e
Copy link
Contributor

bert-e commented Aug 16, 2024

Conflict

There is a conflict between your branch feature/bump-containerd-version and the
destination branch development/128.0.

Please resolve the conflict on the feature branch (feature/bump-containerd-version).

git fetch && \
git checkout origin/feature/bump-containerd-version && \
git merge origin/development/128.0

Resolve merge conflicts and commit

git push origin HEAD:feature/bump-containerd-version

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Aug 16, 2024

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

ezekiel-alexrod
ezekiel-alexrod requested changes Aug 19, 2024
View reviewed changes
CHANGELOG.md Outdated
Comment on lines 24 to 31
<<<<<<< HEAD
- Bump containerd to [1.6.35](https://github.com/containerd/containerd/releases/tag/v1.6.35)
(PR[#4397](https://github.com/scality/metalk8s/pull/4397))
=======
- Bump Loki chart version to
[5.48.0](https://github.com/grafana/loki/releases/tag/helm-loki-5.48.0)
(PR[#4401](https://github.com/scality/metalk8s/pull/4401))
>>>>>>> origin/development/128.0
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's a leftover

@bert-e
Copy link
Contributor

bert-e commented Aug 19, 2024

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:

The following options are set: approve

@m4nch0t m4nch0t force-pushed the feature/bump-containerd-version branch from cfec331 to bc2043c Compare August 19, 2024 09:44
@m4nch0t
Copy link
Author

m4nch0t commented Aug 19, 2024

/approve

@bert-e
Copy link
Contributor

bert-e commented Aug 19, 2024

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

  • ✔️ development/128.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • 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 m4nch0t.

The following options are set: approve

@bert-e bert-e merged commit bc2043c into development/128.0 Aug 19, 2024
26 checks passed
@bert-e bert-e deleted the feature/bump-containerd-version branch August 19, 2024 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ezekiel-alexrod ezekiel-alexrod ezekiel-alexrod approved these changes

Assignees

@m4nch0t m4nch0t

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@m4nch0t @bert-e @ezekiel-alexrod