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.

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

Add details about rolling restart behavior #7372

Merged
merged 3 commits into from Dec 18, 2023

Conversation

jeanfabrice
Copy link
Contributor

Make it clear that stepping over a version that triggers a restart still triggers a restart

@botelastic botelastic bot added the triage label Dec 8, 2023
@thbkrkr thbkrkr added the >docs Documentation label Dec 8, 2023
@botelastic botelastic bot removed the triage label Dec 8, 2023
@thbkrkr thbkrkr added the v2.11.0 label Dec 8, 2023
docs/operating-eck/upgrading-eck.asciidoc Outdated Show resolved Hide resolved
@jeanfabrice jeanfabrice changed the base branch from 2.7 to main December 8, 2023 12:09
@jeanfabrice jeanfabrice changed the base branch from main to 2.7 December 8, 2023 12:13
@jeanfabrice
Copy link
Contributor Author

@thbkrkr Thanks! I checkout from the wrong branch (2.7), not sure how I can fix this from a commit perspective. Trying to rebase on main raises tons of conflicts. Same merging main into this one...
Not a Git expert Should I create a new PR, closing this one?

@thbkrkr
Copy link
Contributor

thbkrkr commented Dec 8, 2023

You can open a PR or force push a new branch, as you want.

# if this repo is the remote 'upstream'
g fetch upstream  # optional to update your local main
g co main
g rebase upstream/main # optional to update your local main

g co -b jeanfabrice-docfix-rollingrestart-2 
g lg jeanfabrice-docfix-rollingrestart | head -2
g cherry-pick 6fa4461d3 && g cherry-pick bff575791

# if your fork is the remote 'origin'
g push -f origin jeanfabrice-docfix-rollingrestart-2:jeanfabrice-docfix-rollingrestart

@jeanfabrice jeanfabrice force-pushed the jeanfabrice-docfix-rollingrestart branch from bff5757 to d26f3bb Compare December 9, 2023 10:55
@jeanfabrice jeanfabrice changed the base branch from 2.7 to main December 9, 2023 10:55
@jeanfabrice
Copy link
Contributor Author

Destination branch has been changed for main. Thank you @thbkrkr!

@thbkrkr thbkrkr merged commit bb84aa3 into main Dec 18, 2023
6 checks passed
@thbkrkr thbkrkr deleted the jeanfabrice-docfix-rollingrestart branch December 18, 2023 16:43
robbavey pushed a commit to robbavey/cloud-on-k8s that referenced this pull request Dec 20, 2023
@thbkrkr thbkrkr changed the title Add details about rolling restarts behaviors Add details about rolling restart behavior Jan 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>docs Documentation v2.11.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants