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

docs: Remove old bootstrap node before restoration #2562

Merged
merged 2 commits into from
May 20, 2020
Merged

docs: Remove old bootstrap node before restoration #2562

merged 2 commits into from
May 20, 2020

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

bootstrap restore

Summary:

  • Install kubectl on all master nodes
  • Add documentation to delete old bootstrap node before restoration

Fixes: #2561

@TeddyAndrieux
salt: Install kubectl on every master nodes
e51b55e 
It may be need to interract with apiserver from master nodes, for
example if bootstrap node is unreachable or ... what ever.
So add `kubectl` salt states for master role
@TeddyAndrieux TeddyAndrieux requested a review from a team May 19, 2020 14:34
@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

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 May 19, 2020

Branches have diverged

This pull request's source branch bugfix/GH-2561-clean-bootstrap-pods-in-restore has diverged from
development/2.6 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/2.6 into bugfix/GH-2561-clean-bootstrap-pods-in-restore
  • Rebase bugfix/GH-2561-clean-bootstrap-pods-in-restore onto origin/development/2.6

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

@TeddyAndrieux TeddyAndrieux changed the base branch from development/2.6 to development/2.4 May 19, 2020 14:34
@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Integration data created

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

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

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

bert-e commented May 19, 2020

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:

gdemonet
gdemonet suggested changes May 19, 2020
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.

Some wording changes, but OK with the idea 👌

docs/operation/bootstrap_backup_restore.rst Outdated Show resolved Hide resolved
docs/operation/bootstrap_backup_restore.rst Outdated Show resolved Hide resolved
docs/operation/bootstrap_backup_restore.rst Outdated Show resolved Hide resolved
docs/operation/bootstrap_backup_restore.rst Show resolved Hide resolved
@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

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:

@TeddyAndrieux
docs: Delete old bootstrap node before restoration
ab89db6 
When restoring bootstrap, as we do not support multi-bootstrap right now
we need to remove the old one before performing the restoration, it's a
bit dangerous to remove this automaticaly from the restore script so
just add documentation to do it

Fixes: #2561
@TeddyAndrieux TeddyAndrieux force-pushed the bugfix/GH-2561-clean-bootstrap-pods-in-restore branch from f436758 to ab89db6 Compare May 19, 2020 15:22
@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

History mismatch

Merge commit #f436758486ae4b45b0183df421b88cfe3386c2ec on the integration branch
w/2.5/bugfix/GH-2561-clean-bootstrap-pods-in-restore is merging a branch which is neither the current
branch bugfix/GH-2561-clean-bootstrap-pods-in-restore nor the development branch
development/2.5.

It is likely due to a rebase of the branch bugfix/GH-2561-clean-bootstrap-pods-in-restore 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
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Integration data created

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

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

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

bert-e commented May 19, 2020

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:

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

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 May 19, 2020

Build failed

The build for commit did not succeed in branch w/2.6/bugfix/GH-2561-clean-bootstrap-pods-in-restore.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Build failed

The build for commit did not succeed in branch bugfix/GH-2561-clean-bootstrap-pods-in-restore.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Build failed

The build for commit did not succeed in branch w/2.6/bugfix/GH-2561-clean-bootstrap-pods-in-restore.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Build failed

The build for commit did not succeed in branch bugfix/GH-2561-clean-bootstrap-pods-in-restore.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Build failed

The build for commit did not succeed in branch w/2.5/bugfix/GH-2561-clean-bootstrap-pods-in-restore.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 20, 2020

Build failed

The build for commit did not succeed in branch w/2.6/bugfix/GH-2561-clean-bootstrap-pods-in-restore.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 20, 2020

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

  • ✔️ development/2.5

  • ✔️ development/2.6

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

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 May 20, 2020

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

  • ✔️ development/2.4

  • ✔️ development/2.5

  • ✔️ development/2.6

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

Please check the status of the associated issue GH-2561.

Goodbye teddyandrieux.

@bert-e bert-e merged commit b16c113 into development/2.4 May 20, 2020
@bert-e bert-e deleted the bugfix/GH-2561-clean-bootstrap-pods-in-restore branch May 20, 2020 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Old "bootstrap" pods not get properly cleaned after bootstrap restore
3 participants
@TeddyAndrieux @bert-e @gdemonet