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

RHDEVDOCS-5912 - Updates to the argo cd CLI installation and reference sections #75177

Conversation

Srivaralakshmi
Copy link
Member

@Srivaralakshmi Srivaralakshmi commented Apr 25, 2024

Jira issue: RHDEVDOCS-5912

Aligned team: DevTools
Cherry-pick to versions: gitops-docs-1.12

Docs preview:

SME review: Completed by @anandf

QE review: Completed by @varshab1210

Peer review:

Additional information: This PR is related to #72634. The content was already reviewed and approved. Due to the content gateway link issue from the Engineering side, certain installation procedures were commented out during the GitOps 1.12 GA. This PR comments-in back those procedures while adding admonition and updates to the content gateway links and their steps. TY!

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 25, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Apr 25, 2024

🤖 Wed May 08 14:18:58 - Prow CI generated the docs preview:
https://75177--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@Srivaralakshmi
Copy link
Member Author

Hi, @anandf and @varshab1210: PTAL at the PR and help with your review inputs. Thanks!

@varshab1210
Copy link

LGTM, thanks

@Srivaralakshmi
Copy link
Member Author

@anandf I have fixed the review comments. PTAL at the revised PR and provide feedback. Thank you!

Copy link

@anandf anandf left a comment

Choose a reason for hiding this comment

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

LGTM

@Srivaralakshmi Srivaralakshmi added the peer-review-needed Signifies that the peer review team needs to review this PR label May 6, 2024
@adellape adellape self-assigned this May 6, 2024
@adellape adellape added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label May 6, 2024
@adellape adellape added this to the Continuous Release milestone May 6, 2024
modules/gitops-installing-argocd-cli-on-linux.adoc Outdated Show resolved Hide resolved
modules/gitops-installing-argocd-cli-on-linux.adoc Outdated Show resolved Hide resolved
modules/gitops-installing-argocd-cli-on-macos.adoc Outdated Show resolved Hide resolved
modules/gitops-installing-argocd-cli-on-macos.adoc Outdated Show resolved Hide resolved
modules/gitops-installing-argocd-cli-on-windows.adoc Outdated Show resolved Hide resolved
modules/gitops-installing-argocd-cli-on-windows.adoc Outdated Show resolved Hide resolved
@adellape adellape added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR peer-review-needed Signifies that the peer review team needs to review this PR labels May 7, 2024
Fixing SME review comments

Fixing additional SME review comments

Fixing peer review comments
@Srivaralakshmi
Copy link
Member Author

Thanks @adellape for the review comments. I have addressed them all and squashed the commits too. PTAL at it and merge the PR if everything checks okay.

@Srivaralakshmi Srivaralakshmi added the merge-review-needed Signifies that the merge review team needs to review this PR label May 8, 2024
Copy link

openshift-ci bot commented May 8, 2024

@Srivaralakshmi: 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.

@adellape adellape added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label May 8, 2024
@adellape adellape merged commit 332e5ec into openshift:gitops-docs-main May 8, 2024
3 checks passed
@adellape
Copy link
Contributor

adellape commented May 8, 2024

/cherrypick gitops-docs-1.12

@adellape
Copy link
Contributor

adellape commented May 8, 2024

@Srivaralakshmi Should this be picked to gitops-docs-1.13 as well or no?

@openshift-cherrypick-robot

@adellape: new pull request created: #75673

In response to this:

/cherrypick gitops-docs-1.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.

@Srivaralakshmi
Copy link
Member Author

@Srivaralakshmi Should this be picked to gitops-docs-1.13 as well or no?

@adellape Yes, CP to gitops-docs-1.13 too please! Thanks for asking :)

@adellape
Copy link
Contributor

adellape commented May 8, 2024

/cherrypick gitops-docs-1.13

@openshift-cherrypick-robot

@adellape: #75177 failed to apply on top of branch "gitops-docs-1.13":

Applying: updates to argo cd CLI doc sections
.git/rebase-apply/patch:104: trailing whitespace.
. Enable the repositories required by {gitops-title} for {op-system-base} version 8 or later by running the following command: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	release_notes/gitops-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging release_notes/gitops-release-notes.adoc
CONFLICT (content): Merge conflict in release_notes/gitops-release-notes.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 updates to argo cd CLI doc sections
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 gitops-docs-1.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.

@adellape adellape 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 May 8, 2024
@adellape
Copy link
Contributor

adellape commented May 8, 2024

@Srivaralakshmi As discussed on Slack, we're fine with the gitops-docs-1.13 CP failing because that branch will be rebased from gitops-docs-main when 1.13 development begins in earnest.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gitops 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
Development

Successfully merging this pull request may close these issues.

None yet

6 participants