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

RHDEVDOCS-4349-fix-incorrect-info-about-alertmanger-instances #51236

Merged
merged 1 commit into from
Oct 12, 2022
Merged

RHDEVDOCS-4349-fix-incorrect-info-about-alertmanger-instances #51236

merged 1 commit into from
Oct 12, 2022

Conversation

bburt-rh
Copy link
Contributor

@bburt-rh bburt-rh commented Oct 4, 2022 •
edited

Summary: This PR fixes an issue where we incorrectly list the number of Alertmanager replicas in OCP 4.10+.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 4, 2022
@bburt-rh bburt-rh requested a review from juzhao October 4, 2022 20:17
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 4, 2022 •
edited

🤖 Updated build preview is available at:
https://51236--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/1610

jc-berger
jc-berger approved these changes Oct 7, 2022
View reviewed changes
Copy link
Contributor

@jc-berger jc-berger left a comment

Choose a reason for hiding this comment

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

/lgtm

modules/monitoring-configuring-persistent-storage.adoc Outdated Show resolved Hide resolved
@openshift-ci
Copy link

openshift-ci bot commented Oct 7, 2022

@jc-berger: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@bburt-rh bburt-rh force-pushed the RHDEVDOCS-4349-fix-incorrect-info-about-alertmanger-instances branch from 160e584 to 7dd8d51 Compare October 7, 2022 15:42
jc-berger
jc-berger approved these changes Oct 7, 2022
View reviewed changes
Copy link
Contributor

@jc-berger jc-berger left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Oct 7, 2022

@jc-berger: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@bburt-rh bburt-rh force-pushed the RHDEVDOCS-4349-fix-incorrect-info-about-alertmanger-instances branch from 7dd8d51 to bde5820 Compare October 11, 2022 13:18
@bburt-rh bburt-rh force-pushed the RHDEVDOCS-4349-fix-incorrect-info-about-alertmanger-instances branch from bde5820 to f217c9b Compare October 11, 2022 13:23
@bburt-rh bburt-rh requested a review from juzhao October 11, 2022 13:23
@bburt-rh
Copy link
Contributor Author

@juzhao PTAL at the updated text and approve if ready. Thanks!

@juzhao
Copy link

juzhao commented Oct 12, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 12, 2022
jc-berger
jc-berger approved these changes Oct 12, 2022
View reviewed changes
Copy link
Contributor

@jc-berger jc-berger left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2022

@jc-berger: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@bburt-rh bburt-rh added peer-review-done Signifies that the peer review team has reviewed this PR dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs qe-approved Signifies that QE has signed off on this PR branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 labels Oct 12, 2022
@bburt-rh bburt-rh added this to the Continuous Release milestone Oct 12, 2022
@bburt-rh bburt-rh merged commit d24eb17 into openshift:main Oct 12, 2022
@bburt-rh
Copy link
Contributor Author

/cherrypick enterprise-4.10

@bburt-rh
Copy link
Contributor Author

/cherrypick enterprise-4.11

@bburt-rh
Copy link
Contributor Author

/cherrypick enterprise-4.12

@openshift-cherrypick-robot
Copy link

@bburt-rh: #51236 failed to apply on top of branch "enterprise-4.10":

Applying: RHDEVDOCS-4349-fix-incorrect-info-about-alertmanger-instances
Using index info to reconstruct a base tree...
A	modules/monitoring-configuring-persistent-storage.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/monitoring-configuring-persistent-storage.adoc deleted in HEAD and modified in RHDEVDOCS-4349-fix-incorrect-info-about-alertmanger-instances. Version RHDEVDOCS-4349-fix-incorrect-info-about-alertmanger-instances of modules/monitoring-configuring-persistent-storage.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 RHDEVDOCS-4349-fix-incorrect-info-about-alertmanger-instances
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.10

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

@bburt-rh: new pull request created: #51556

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.

This was referenced Oct 12, 2022
Merged
Merged
@openshift-cherrypick-robot
Copy link

@bburt-rh: new pull request created: #51557

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.

@bburt-rh bburt-rh mentioned this pull request Oct 12, 2022
Merged
@bburt-rh bburt-rh deleted the RHDEVDOCS-4349-fix-incorrect-info-about-alertmanger-instances branch June 6, 2023 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jc-berger jc-berger jc-berger approved these changes

@juzhao juzhao Awaiting requested review from juzhao

Assignees

@juzhao juzhao

Labels
branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR qe-approved Signifies that QE has signed off on this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@bburt-rh @ocpdocs-previewbot @juzhao @openshift-cherrypick-robot @jc-berger