Skip to content

Bump vault with signatureAge of 0 fix - #2493

Merged
bert-e merged 1 commit into
development/2.13from
improvement/ZENKO-5348-bump-vault
Aug 29, 2026
Merged

Bump vault with signatureAge of 0 fix#2493
bert-e merged 1 commit into
development/2.13from
improvement/ZENKO-5348-bump-vault

Conversation

@benzekrimaha

@benzekrimaha benzekrimaha commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Picks up the vault fix accepting falsy constant params in request context validation: a signatureAge of 0 was dropped from the request context, failing policy evaluation.

Issue: ZENKO-5348

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Hello benzekrimaha,

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.
/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.

@benzekrimaha benzekrimaha changed the title Bump vault to 8.10.6 Bump vault Aug 17, 2026
@benzekrimaha benzekrimaha changed the title Bump vault Bump vault with signatureAge of 0 fix Aug 17, 2026
@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@benzekrimaha

Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/2.13/improvement/ZENKO-5348-bump-vault with contents from improvement/ZENKO-5348-bump-vault
and development/2.13.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/2.13/improvement/ZENKO-5348-bump-vault origin/development/2.13
 git merge origin/improvement/ZENKO-5348-bump-vault
 # <intense conflict resolution>
 git commit
 git push -u origin w/2.13/improvement/ZENKO-5348-bump-vault

The following options are set: create_integration_branches

@benzekrimaha

Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

@benzekrimaha

Copy link
Copy Markdown
Contributor Author

/create_pull_requests

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Integration data created

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

The following branches will NOT be impacted:

  • development/2.10
  • development/2.11
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_pull_requests, create_integration_branches

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the update of
integration branch w/2.13/improvement/ZENKO-5348-bump-vault with contents from improvement/ZENKO-5348-bump-vault
and development/2.13.

Please resolve the conflict on the integration branch (w/2.13/improvement/ZENKO-5348-bump-vault).

Here are the steps to resolve this conflict:

 git fetch
 git checkout w/2.13/improvement/ZENKO-5348-bump-vault
 git pull  # or "git reset --hard origin/w/2.13/improvement/ZENKO-5348-bump-vault"
 git merge origin/development/2.13
 # <intense conflict resolution>
 git commit
 git merge origin/improvement/ZENKO-5348-bump-vault
 # <intense conflict resolution>
 git commit
 git push -u origin w/2.13/improvement/ZENKO-5348-bump-vault

The following options are set: create_pull_requests, create_integration_branches

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_pull_requests, create_integration_branches

@benzekrimaha
benzekrimaha force-pushed the improvement/ZENKO-5348-bump-vault branch 2 times, most recently from ad7e2c5 to 282b373 Compare August 17, 2026 11:48
@benzekrimaha

benzekrimaha commented Aug 17, 2026

Copy link
Copy Markdown
Contributor Author

ping

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Status

check status
➡️ Approvals ❗ author approval required — 2 peer approval(s) missing
➡️ Integration builds ❗ w/2.13/improvement/ZENKO-5348-bump-vault: INPROGRESS
➡️ Fix versions ☀️
➡️ History ☀️

The following options are set: create_pull_requests, create_integration_branches

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Integration data created

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

The following branches will NOT be impacted:

  • development/2.10
  • development/2.11
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_pull_requests, create_integration_branches

@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the update of
integration branch w/2.14/improvement/ZENKO-5348-bump-vault with contents from w/2.13/improvement/ZENKO-5348-bump-vault
and development/2.14.

Please resolve the conflict on the integration branch (w/2.14/improvement/ZENKO-5348-bump-vault).

Here are the steps to resolve this conflict:

 git fetch
 git checkout w/2.14/improvement/ZENKO-5348-bump-vault
 git pull  # or "git reset --hard origin/w/2.14/improvement/ZENKO-5348-bump-vault"
 git merge origin/development/2.14
 # <intense conflict resolution>
 git commit
 git merge origin/w/2.13/improvement/ZENKO-5348-bump-vault
 # <intense conflict resolution>
 git commit
 git push -u origin w/2.14/improvement/ZENKO-5348-bump-vault

The following options are set: create_pull_requests, create_integration_branches

@benzekrimaha
benzekrimaha force-pushed the improvement/ZENKO-5348-bump-vault branch from 28547a5 to 2da44a4 Compare August 17, 2026 12:38
@bert-e

bert-e commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

History mismatch

Merge commit #938ac81f28d8a1e01444db42c618e6ceedac442d on the integration branch
w/2.13/improvement/ZENKO-5348-bump-vault is merging a branch which is neither the current
branch improvement/ZENKO-5348-bump-vault nor the development branch
development/2.13.

It is likely due to a rebase of the branch improvement/ZENKO-5348-bump-vault 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.

The following options are set: create_pull_requests, create_integration_branches

@bert-e

bert-e commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Integration data created

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

The following branches will NOT be impacted:

  • development/2.10
  • development/2.11
  • development/2.12
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

@bert-e

bert-e commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_pull_requests, create_integration_branches

@scality scality deleted a comment from bert-e Aug 25, 2026
@scality scality deleted a comment from bert-e Aug 26, 2026
@benzekrimaha

Copy link
Copy Markdown
Contributor Author

/reset

@bert-e

bert-e commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict
resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me
to delete those branches.

The following options are set: approve, create_pull_requests, create_integration_branches

@benzekrimaha

Copy link
Copy Markdown
Contributor Author

/force_reset

@bert-e

bert-e commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_pull_requests, create_integration_branches

@benzekrimaha

Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e

bert-e commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

Integration data created

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

The following branches will NOT be impacted:

  • development/2.10
  • development/2.11
  • development/2.12
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

@bert-e

bert-e commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_pull_requests, create_integration_branches

@benzekrimaha

Copy link
Copy Markdown
Contributor Author

/approve

@bert-e

bert-e commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

Build failed

The build for commit did not succeed in branch w/2.14/improvement/ZENKO-5348-bump-vault

The following options are set: approve, create_pull_requests, create_integration_branches

@scality scality deleted a comment from bert-e Aug 28, 2026
@scality scality deleted a comment from bert-e Aug 28, 2026
@bert-e

bert-e commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

Queue build failed

The corresponding build for the queue failed:

  • Checkout the status page.
  • Identify the failing build and review the logs.
  • If no issue is found, re-run the build.
  • If an issue is identified, checkout the steps below to remove
    the pull request from the queue for further analysis and maybe rebase/merge.
Remove the pull request from the queue
  • Add a /wait comment on this pull request.
  • Click on login on the status page.
  • Go into the manage page.
  • Find the option called Rebuild the queue and click on it.
    Bert-E will loop again on all pull requests to put the valid ones
    in the queue again, while skipping the one with the /wait comment.
  • Wait for the new queue to merge, then merge/rebase your pull request
    with the latest changes to then work on a proper fix.
  • Once the issue is fixed, delete the /wait comment and
    follow the usual process to merge the pull request.

@scality scality deleted a comment from bert-e Aug 28, 2026
@bert-e

bert-e commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

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

  • ✔️ development/2.13

  • ✔️ development/2.14

  • ✔️ development/2.15

  • ✔️ development/2.16

The following branches have NOT changed:

  • development/2.10
  • development/2.11
  • development/2.12
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue ZENKO-5348.

Goodbye benzekrimaha.

@bert-e
bert-e merged commit d7d0b51 into development/2.13 Aug 29, 2026
167 of 184 checks passed
@bert-e
bert-e deleted the improvement/ZENKO-5348-bump-vault branch August 29, 2026 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants