Skip to content

Conversation

Srivaralakshmi
Copy link
Contributor

@Srivaralakshmi Srivaralakshmi commented Sep 26, 2023

Version(s): gitops-docs, gitops-docs-1.10.

Issue:
RHDEVDOCS-5172

Link to docs preview: https://65259--docspreview.netlify.app/openshift-gitops/latest/understanding_openshift_gitops/what-is-gitops.html

Peer review and Merge review: @gabriel-rh

Additional Info: While it is a size L there is no significant new content. These files are seen in the PR as new but the content is all from the pre-existing assemblies/modules. Only necessary edits were made to rectify the legacy content errors to keep them in line with the OCP docs, mod docs, and RH SSG guidelines.

The necessary edits are part of enabling the standalone documentation set for OpenShift GitOps. It was approved by the PM and Content Strategist. It does not affect the main at all, only gitops-docs and gitops-docs-1.10. The PR does not change documentation content, except copying modules or assemblies from the main that were already reviewed for merging to the main.

Reference - 1.10 PRs in main:

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

ocpdocs-previewbot commented Sep 26, 2023

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

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

@Srivaralakshmi Srivaralakshmi force-pushed the RHDEVDOCS-5172-addingsections-from-main-to-1-10-0 branch from e2f6974 to 372967d Compare September 26, 2023 18:56
@gabriel-rh gabriel-rh merged commit 43a5595 into openshift:gitops-docs Sep 27, 2023
@gabriel-rh
Copy link
Contributor

/cherry-pick gitops-docs-1.10

@openshift-cherrypick-robot

@gabriel-rh: #65259 failed to apply on top of branch "gitops-docs-1.10":

Applying: shallow restructure, files addition from main to 1.10 branch
Using index info to reconstruct a base tree...
A	accesscontrol_usermanagement/configuring-sso-on-argo-cd-using-dex.adoc
A	modules/gitops-about-argo-rollout-manager-custom-resources-and-spec.adoc
M	modules/gitops-argo-cd-notification.adoc
M	modules/gitops-argo-cd-properties.adoc
A	modules/gitops-configuring-tls-for-redis-with-autotls-disabled.adoc
A	modules/gitops-configuring-tls-for-redis-with-autotls-enabled.adoc
A	modules/gitops-configuring-workloads.adoc
M	modules/gitops-creating-a-new-client-in-dex.adoc
M	modules/gitops-creating-a-new-client-using-keycloak.adoc
A	modules/gitops-creating-rolloutmanager-custom-resource.adoc
M	modules/gitops-disable-dex-using-spec-sso.adoc
M	modules/gitops-disable-dex.adoc
M	modules/gitops-disabling-monitoring-for-argo-cd-custom-resource-workloads.adoc
M	modules/gitops-enable-replicas-for-argo-cd-server.adoc
M	modules/gitops-enabling-monitoring-for-argo-cd-custom-resource-workloads.adoc
M	modules/gitops-installing-olm-operators-using-gitops.adoc
M	modules/gitops-release-notes-1-9-0.adoc.git/rebase-apply/patch:185: trailing whitespace.
Dex is installed by default for all the Argo CD instances created by the Operator. You can configure {gitops-title} to use Dex as the SSO authentication provider by setting the `.spec.sso` parameter. 
.git/rebase-apply/patch:524: trailing whitespace.
==== 
.git/rebase-apply/patch:532: trailing whitespace.
==== 
warning: 3 lines add whitespace errors.

M	modules/gitops-uninstall-keycloak.adoc
M	modules/gitops-using-argo-cd-instance-to-manage-cluster-scoped-resources.adoc
M	modules/go-compatibility-and-support-matrix.adoc
A	modules/go-settings-for-environment-labels-and-annotations.adoc
A	release_notes/gitops-release-notes.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/go-settings-for-environment-labels-and-annotations.adoc deleted in HEAD and modified in shallow restructure, files addition from main to 1.10 branch. Version shallow restructure, files addition from main to 1.10 branch of modules/go-settings-for-environment-labels-and-annotations.adoc left in tree.
Auto-merging modules/go-compatibility-and-support-matrix.adoc
Auto-merging modules/gitops-using-argo-cd-instance-to-manage-cluster-scoped-resources.adoc
Auto-merging modules/gitops-uninstall-keycloak.adoc
Auto-merging modules/gitops-release-notes-1-9-0.adoc
Auto-merging modules/gitops-installing-olm-operators-using-gitops.adoc
Auto-merging modules/gitops-enabling-monitoring-for-argo-cd-custom-resource-workloads.adoc
Auto-merging modules/gitops-enable-replicas-for-argo-cd-server.adoc
Auto-merging modules/gitops-disabling-monitoring-for-argo-cd-custom-resource-workloads.adoc
Auto-merging modules/gitops-disable-dex.adoc
Auto-merging modules/gitops-disable-dex-using-spec-sso.adoc
CONFLICT (modify/delete): modules/gitops-creating-rolloutmanager-custom-resource.adoc deleted in HEAD and modified in shallow restructure, files addition from main to 1.10 branch. Version shallow restructure, files addition from main to 1.10 branch of modules/gitops-creating-rolloutmanager-custom-resource.adoc left in tree.
Auto-merging modules/gitops-creating-a-new-client-using-keycloak.adoc
Auto-merging modules/gitops-creating-a-new-client-in-dex.adoc
CONFLICT (content): Merge conflict in modules/gitops-creating-a-new-client-in-dex.adoc
CONFLICT (modify/delete): modules/gitops-configuring-tls-for-redis-with-autotls-enabled.adoc deleted in HEAD and modified in shallow restructure, files addition from main to 1.10 branch. Version shallow restructure, files addition from main to 1.10 branch of modules/gitops-configuring-tls-for-redis-with-autotls-enabled.adoc left in tree.
CONFLICT (modify/delete): modules/gitops-configuring-tls-for-redis-with-autotls-disabled.adoc deleted in HEAD and modified in shallow restructure, files addition from main to 1.10 branch. Version shallow restructure, files addition from main to 1.10 branch of modules/gitops-configuring-tls-for-redis-with-autotls-disabled.adoc left in tree.
Auto-merging modules/gitops-argo-cd-properties.adoc
Auto-merging modules/gitops-argo-cd-notification.adoc
CONFLICT (modify/delete): modules/gitops-about-argo-rollout-manager-custom-resources-and-spec.adoc deleted in HEAD and modified in shallow restructure, files addition from main to 1.10 branch. Version shallow restructure, files addition from main to 1.10 branch of modules/gitops-about-argo-rollout-manager-custom-resources-and-spec.adoc left in tree.
Auto-merging modules/configure-workloads.adoc
Auto-merging gitops/gitops-release-notes.adoc
CONFLICT (content): Merge conflict in gitops/gitops-release-notes.adoc
Auto-merging gitops/configuring-sso-on-argo-cd-using-dex.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 shallow restructure, files addition from main to 1.10 branch
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:

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

@gabriel-rh
Copy link
Contributor

/cherry-pick gitops-docs-1.10

@openshift-cherrypick-robot

@gabriel-rh: new pull request could not be created: failed to create pull request against openshift/openshift-docs#gitops-docs-1.10 from head openshift-cherrypick-robot:cherry-pick-65259-to-gitops-docs-1.10: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"No commits between openshift:gitops-docs-1.10 and openshift-cherrypick-robot:cherry-pick-65259-to-gitops-docs-1.10"}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request"}

In response to this:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

4 participants