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

ml-jira-2756:Documented monitoring Argo CD instances. #63914

Merged
merged 1 commit into from Aug 29, 2023
Merged

ml-jira-2756:Documented monitoring Argo CD instances. #63914

merged 1 commit into from Aug 29, 2023

Conversation

masauso-lungu
Copy link
Contributor

@masauso-lungu masauso-lungu commented Aug 24, 2023 •
edited

Jira issue : RHDEVDOCS-2756

Aligned team: DevTools

OCP Version(s): 4.10 and later

Docs preview: 63914--docspreview
SME review: @reginapizza

QE review: @varshab1210

Peer review: @Srivaralakshmi

NOTE: RESUBMISSION OF FAILED PR-62018

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 24, 2023
@openshift-ci-robot
Copy link

@masauso-lungu: This pull request references jira-2756 which is a valid jira issue.

In response to this:

Jira issue : RHDEVDOCS-2756

Aligned team: DevTools

OCP Version(s): 4.10 and later

Docs preview:
SME review: @reginapizza

QE review: @varshab1210

Peer review: @Srivaralakshmi

NOTE: RESUBMISSION OF FAILED PR-62018

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-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 24, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Aug 24, 2023 •
edited

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

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

@openshift-ci-robot
Copy link

@masauso-lungu: This pull request references jira-2756 which is a valid jira issue.

In response to this:

Jira issue : RHDEVDOCS-2756

Aligned team: DevTools

OCP Version(s): 4.10 and later

Docs preview: 63914--docspreview
SME review: @reginapizza

QE review: @varshab1210

Peer review: @Srivaralakshmi

NOTE: RESUBMISSION OF FAILED PR-62018

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.

Srivaralakshmi
Srivaralakshmi approved these changes Aug 25, 2023
View reviewed changes
Copy link
Member

@Srivaralakshmi Srivaralakshmi left a comment

Choose a reason for hiding this comment

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

@masauso-lungu Approved!

@Srivaralakshmi
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 25, 2023
@varshab1210
Copy link

LGTM

@masauso-lungu
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 Aug 25, 2023
@mburke5678 mburke5678 added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Aug 28, 2023
@mburke5678 mburke5678 added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Aug 28, 2023
@Srivaralakshmi
Copy link
Member

/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 Aug 29, 2023
@masauso-lungu
ml-jira-2756:Documented monitoring Argo CD instances
e9baf0d 
Miner update to address merge review.
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 29, 2023
@openshift-ci
Copy link

openshift-ci bot commented Aug 29, 2023

New changes are detected. LGTM label has been removed.

@masauso-lungu
Copy link
Contributor Author

/label merge-review-needed

@mburke5678 mburke5678 added this to the Continuous Release milestone Aug 29, 2023
@mburke5678 mburke5678 merged commit 18c2e15 into openshift:main Aug 29, 2023
1 check passed
@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.10

@openshift-cherrypick-robot
Copy link

@mburke5678: #63914 failed to apply on top of branch "enterprise-4.10":

Applying: ml-jira-2756:Documented monitoring Argo CD instances
.git/rebase-apply/patch:18: trailing whitespace.
    File: monitoring-argo-cd-instances  
.git/rebase-apply/patch:73: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ml-jira-2756:Documented monitoring Argo CD 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.

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.11

@openshift-cherrypick-robot
Copy link

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

Applying: ml-jira-2756:Documented monitoring Argo CD instances
.git/rebase-apply/patch:18: trailing whitespace.
    File: monitoring-argo-cd-instances  
.git/rebase-apply/patch:73: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ml-jira-2756:Documented monitoring Argo CD 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.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.

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.12

@openshift-cherrypick-robot
Copy link

@mburke5678: new pull request created: #64018

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 openshift-cherrypick-robot mentioned this pull request Aug 29, 2023
Merged
@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.13

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.14

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 29, 2023
Merged
@openshift-cherrypick-robot
Copy link

@mburke5678: new pull request created: #64020

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

@mburke5678: new pull request created: #64021

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 Aug 29, 2023
Merged
This was referenced Aug 29, 2023
Merged
Merged
@mburke5678 mburke5678 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 Aug 29, 2023
@masauso-lungu masauso-lungu deleted the ml-jira-2756 branch October 18, 2023 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mburke5678 mburke5678 mburke5678 left review comments

@Srivaralakshmi Srivaralakshmi Srivaralakshmi approved these changes

@reginapizza reginapizza reginapizza approved these changes

Assignees

@Srivaralakshmi Srivaralakshmi

Labels
branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@masauso-lungu @openshift-ci-robot @ocpdocs-previewbot @Srivaralakshmi @varshab1210 @mburke5678 @openshift-cherrypick-robot @reginapizza