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

OCPBUGS-20194: Stop other control plane components on non-recovery hosts during etcd restore procedure #70568

Merged
merged 1 commit into from
Jan 31, 2024
Merged

OCPBUGS-20194: Stop other control plane components on non-recovery hosts during etcd restore procedure #70568

merged 1 commit into from
Jan 31, 2024

Conversation

nalhadef
Copy link
Contributor

@nalhadef nalhadef commented Jan 19, 2024 •
edited

@openshift-ci-robot
Copy link

@nalhadef: No Jira issue with key OCPBUG-20194 exists in the tracker at https://issues.redhat.com/.
Once a valid jira issue is referenced in the title of this pull request, request a refresh with /jira refresh.

In response to this:

Version(s):

4.11 - 4.15

Issue:

Link to issue

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@nalhadef nalhadef changed the title OCPBUG-20194: Stop other control plane components on non-recovery hosts during etcd restore procedure OCPBUGS-20194: Stop other control plane components on non-recovery hosts during etcd restore procedure Jan 19, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 19, 2024
@openshift-ci-robot
Copy link

@nalhadef: This pull request references Jira Issue OCPBUGS-20194, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Version(s):

4.11 - 4.15

Issue:

Link to issue

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 19, 2024
@nalhadef
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link

@nalhadef: This pull request references Jira Issue OCPBUGS-20194, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jan 19, 2024 •
edited

🤖 Wed Jan 31 12:23:07 - Prow CI generated the docs preview: https://70568--ocpdocs-pr.netlify.app

@nalhadef
Copy link
Contributor Author

nalhadef commented Jan 19, 2024 •
edited

@palonsoro

Hi, Pablo.

Please check out this preview and let me know whether I covered all your concerns from OCPBUGS-20194.

Thanks!

Neal

@palonsoro
Copy link
Contributor

Hello.

Among the requirements in OCPBUGS-20194, it only covered the one about steps 7 and 4e (which was 4d at the time of reporting, but is now 4e).

However, it does not cover the main point of the bug report, which is the required changes in step 4 about kube-controller-manager-pod.yaml and kube-scheduler-pod.yaml.

Please review that point. It contains the requested set of changes on step 4. Note that the steps might look somewhat similar to some of the current ones, but the names are not equal (basically we now request to stop 2 components and we have to also stop another 2 with similar steps).

@nalhadef
Copy link
Contributor Author

nalhadef commented Jan 22, 2024 via email

@nalhadef
Copy link
Contributor Author

/retest

@palonsoro
Copy link
Contributor

@nalhadef You correctly added steps for kube-controller-manager.yaml, which is ok (thanks) but steps for kube-scheduler are still missing. Please add those as well.

Thanks in advance

@nalhadef
Copy link
Contributor Author

/retest

1 similar comment
@nalhadef
Copy link
Contributor Author

/retest

@palonsoro
Copy link
Contributor

All the points in the bug description are now properly addressed.

Thank you very much @nalhadef !!!

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 26, 2024
@nalhadef
Copy link
Contributor Author

nalhadef commented Jan 26, 2024 via email

@nalhadef
Copy link
Contributor Author

Hello, @geliu2016.

I think you are the QE for this item. If so, please review. If it's OK, please indicate with a LGTM and selecting QE has approved this change in the first comment. If you are not the QE, can you tell me who is?

Thanks,
Neal

@nalhadef
Copy link
Contributor Author

nalhadef commented Jan 26, 2024 •
edited

Approved by the reporter and sent to the possible QE, GE Liu.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 26, 2024
@geliu2016
Copy link

/lgtm

@ousleyp
Copy link
Member

ousleyp commented Jan 30, 2024

Hey @nalhadef , thanks for making the changes. :) If you're ready for merge review again, please put the merge-review-needed label back on the PR so that it goes into the queue. Much appreciated!

@nalhadef
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Jan 30, 2024
@nalhadef
Copy link
Contributor Author

nalhadef commented Jan 30, 2024 via email

@palonsoro
Copy link
Contributor

@nalhadef Regarding this line:

An installed command-line interface for CRI-compatible container runtimes (`crictl`).

This shouldn't be listed as a requirement. Control plane nodes can only use RHCOS, which already ships the right version of this tool and it is unsupported (and difficult) to remove or replace it.

@nalhadef
Copy link
Contributor Author

nalhadef commented Jan 31, 2024 via email

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 31, 2024

@nalhadef: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@mburke5678 mburke5678 added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Jan 31, 2024
@mburke5678 mburke5678 merged commit f5c807d into openshift:main Jan 31, 2024
2 checks passed
@openshift-ci-robot
Copy link

@nalhadef: Jira Issue OCPBUGS-20194: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-20194 has been moved to the MODIFIED state.

In response to this:

Version(s):

4.11 - 4.15

Issue:

Link to issue

Link to docs preview:

https://70568--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state#dr-scenario-2-restoring-cluster-state_dr-restoring-cluster-state

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.11

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.12

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.13

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.14

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.15

@openshift-cherrypick-robot
Copy link

@mburke5678: #70568 failed to apply on top of branch "enterprise-4.11":

Applying: OCPBUG-20194: Adding steps to properly restart kube-scheduler and kube-controller-manager.
.git/rebase-apply/patch:128: trailing whitespace.
---- 
.git/rebase-apply/patch:193: trailing whitespace.
<1> A pending kubelet service 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/dr-restoring-cluster-state.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/dr-restoring-cluster-state.adoc
CONFLICT (content): Merge conflict in modules/dr-restoring-cluster-state.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUG-20194: Adding steps to properly restart kube-scheduler and kube-controller-manager.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

@mburke5678: #70568 failed to apply on top of branch "enterprise-4.12":

Applying: OCPBUG-20194: Adding steps to properly restart kube-scheduler and kube-controller-manager.
.git/rebase-apply/patch:128: trailing whitespace.
---- 
.git/rebase-apply/patch:193: trailing whitespace.
<1> A pending kubelet service 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/dr-restoring-cluster-state.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/dr-restoring-cluster-state.adoc
CONFLICT (content): Merge conflict in modules/dr-restoring-cluster-state.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUG-20194: Adding steps to properly restart kube-scheduler and kube-controller-manager.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

@mburke5678: #70568 failed to apply on top of branch "enterprise-4.13":

Applying: OCPBUG-20194: Adding steps to properly restart kube-scheduler and kube-controller-manager.
.git/rebase-apply/patch:128: trailing whitespace.
---- 
.git/rebase-apply/patch:193: trailing whitespace.
<1> A pending kubelet service 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/dr-restoring-cluster-state.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/dr-restoring-cluster-state.adoc
CONFLICT (content): Merge conflict in modules/dr-restoring-cluster-state.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUG-20194: Adding steps to properly restart kube-scheduler and kube-controller-manager.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 31, 2024
Merged
@openshift-cherrypick-robot
Copy link

@mburke5678: new pull request created: #71059

In response to this:

/cherrypick enterprise-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 31, 2024
Merged
@openshift-cherrypick-robot
Copy link

@mburke5678: new pull request created: #71060

In response to this:

/cherrypick enterprise-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

This was referenced Jan 31, 2024
Merged
Merged
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@palonsoro palonsoro palonsoro left review comments

@ousleyp ousleyp ousleyp left review comments

@dfitzmau dfitzmau dfitzmau left review comments

@jeana-redhat jeana-redhat jeana-redhat left review comments

Assignees

@palonsoro palonsoro

@geliu2016 geliu2016

Labels
branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@nalhadef @openshift-ci-robot @ocpdocs-previewbot @palonsoro @geliu2016 @dfitzmau @ousleyp @mburke5678 @openshift-cherrypick-robot @jeana-redhat