Skip to content

Conversation

jmagak
Copy link
Member

@jmagak jmagak commented Sep 2, 2025

IMPORTANT: Do Not Merge - To be merged by Docs Team Only

Version(s): 1.7, 1.6, main

Issue: RHIDP-2628

Preview:

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Sep 2, 2025

@jmagak jmagak force-pushed the RHIDP-2628-Add-Sizing-requirements-as-a-prereq-for-RHDH-installation branch from 004fe7d to 07d1ef9 Compare September 4, 2025 08:29
@jmagak jmagak force-pushed the RHIDP-2628-Add-Sizing-requirements-as-a-prereq-for-RHDH-installation branch from 07d1ef9 to 35e6f5b Compare September 5, 2025 10:51
@jmagak jmagak force-pushed the RHIDP-2628-Add-Sizing-requirements-as-a-prereq-for-RHDH-installation branch from 35e6f5b to 6ff84e6 Compare September 5, 2025 15:29
@jmagak jmagak force-pushed the RHIDP-2628-Add-Sizing-requirements-as-a-prereq-for-RHDH-installation branch from 6ff84e6 to e4d2ef4 Compare September 8, 2025 10:01
Copy link
Member

@Fortune-Ndlovu Fortune-Ndlovu left a comment

Choose a reason for hiding this comment

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

Thank you @jmagak
/lgtm
/approve

@openshift-ci openshift-ci bot removed the lgtm label Sep 9, 2025
Copy link

openshift-ci bot commented Sep 9, 2025

New changes are detected. LGTM label has been removed.

@pabel-rh pabel-rh merged commit 1354726 into redhat-developer:main Sep 9, 2025
3 checks passed
@pabel-rh
Copy link
Member

pabel-rh commented Sep 9, 2025

/cherry-pick release-1.7

@pabel-rh
Copy link
Member

pabel-rh commented Sep 9, 2025

/cherry-pick release-1.6

@openshift-cherrypick-robot
Copy link
Contributor

@pabel-rh: #1345 failed to apply on top of branch "release-1.7":

Applying: Add Sizing requirements as a prereq for RHDH installation
Using index info to reconstruct a base tree...
M	modules/installation/proc-install-operator.adoc
M	modules/installation/proc-install-rhdh-helm-airgapped-full.adoc
M	modules/installation/proc-install-rhdh-helm-airgapped-partial.adoc
M	modules/installation/proc-install-rhdh-ocp-helm-gui.adoc
M	modules/installation/proc-install-rhdh-operator-airgapped-full.adoc
M	modules/installation/proc-install-rhdh-operator-airgapped-partial.adoc
M	modules/installation/proc-install-rhdh-osd-gcp-helm.adoc
M	modules/installation/proc-install-rhdh-osd-gcp-operator.adoc
M	modules/installation/proc-rhdh-deploy-aks-helm.adoc
M	modules/installation/proc-rhdh-deploy-eks-helm.adoc
M	modules/installation/proc-rhdh-deploy-eks-operator.adoc
M	modules/installation/proc-rhdh-deploy-gke-helm.adoc
M	modules/installation/proc-rhdh-deploy-gke-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation/proc-rhdh-deploy-gke-operator.adoc
Auto-merging modules/installation/proc-rhdh-deploy-gke-helm.adoc
CONFLICT (content): Merge conflict in modules/installation/proc-rhdh-deploy-gke-helm.adoc
Auto-merging modules/installation/proc-rhdh-deploy-eks-operator.adoc
Auto-merging modules/installation/proc-rhdh-deploy-eks-helm.adoc
Auto-merging modules/installation/proc-rhdh-deploy-aks-helm.adoc
Auto-merging modules/installation/proc-install-rhdh-osd-gcp-operator.adoc
Auto-merging modules/installation/proc-install-rhdh-osd-gcp-helm.adoc
Auto-merging modules/installation/proc-install-rhdh-operator-airgapped-partial.adoc
Auto-merging modules/installation/proc-install-rhdh-operator-airgapped-full.adoc
CONFLICT (content): Merge conflict in modules/installation/proc-install-rhdh-operator-airgapped-full.adoc
Auto-merging modules/installation/proc-install-rhdh-ocp-helm-gui.adoc
CONFLICT (content): Merge conflict in modules/installation/proc-install-rhdh-ocp-helm-gui.adoc
Auto-merging modules/installation/proc-install-rhdh-helm-airgapped-partial.adoc
Auto-merging modules/installation/proc-install-rhdh-helm-airgapped-full.adoc
Auto-merging modules/installation/proc-install-operator.adoc
CONFLICT (content): Merge conflict in modules/installation/proc-install-operator.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add Sizing requirements as a prereq for RHDH installation

In response to this:

/cherry-pick release-1.7

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-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Contributor

@pabel-rh: #1345 failed to apply on top of branch "release-1.6":

Applying: Add Sizing requirements as a prereq for RHDH installation
Applying: Incorporate Jana's suggestion
Applying: Apply Heena's suggestions
Applying: Incorporate Heena's suggestion
Applying: Apply Fortune's suggestion
Applying: Add Sizing requirements as a prereq for RHDH installation
Using index info to reconstruct a base tree...
M	modules/installation/proc-install-operator.adoc
M	modules/installation/proc-install-rhdh-ocp-helm-gui.adoc
M	modules/installation/proc-install-rhdh-operator-airgapped-full.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation/proc-install-rhdh-operator-airgapped-full.adoc
CONFLICT (content): Merge conflict in modules/installation/proc-install-rhdh-operator-airgapped-full.adoc
Auto-merging modules/installation/proc-install-rhdh-ocp-helm-gui.adoc
CONFLICT (content): Merge conflict in modules/installation/proc-install-rhdh-ocp-helm-gui.adoc
Auto-merging modules/installation/proc-install-operator.adoc
CONFLICT (content): Merge conflict in modules/installation/proc-install-operator.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0006 Add Sizing requirements as a prereq for RHDH installation

In response to this:

/cherry-pick release-1.6

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-sigs/prow repository.

jmagak added a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request Sep 9, 2025
…llation (redhat-developer#1345)

* Add Sizing requirements as a prereq for RHDH installation

* Incorporate Jana's suggestion

* Apply Heena's suggestions

* Incorporate Heena's suggestion

* Apply Fortune's suggestion

* Add Sizing requirements as a prereq for RHDH installation

---------

Co-authored-by: GitHub Actions <[email protected]>
jmagak added a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request Sep 10, 2025
…llation (redhat-developer#1345)

* Add Sizing requirements as a prereq for RHDH installation

* Incorporate Jana's suggestion

* Apply Heena's suggestions

* Incorporate Heena's suggestion

* Apply Fortune's suggestion

* Add Sizing requirements as a prereq for RHDH installation

---------

Co-authored-by: GitHub Actions <[email protected]>
pabel-rh pushed a commit that referenced this pull request Sep 10, 2025
…sites for RHDH insta… (#1362)

* RHIDP-2628: Add Sizing requirements as a prerequisites for RHDH installation (#1345)

* Add Sizing requirements as a prereq for RHDH installation

* Incorporate Jana's suggestion

* Apply Heena's suggestions

* Incorporate Heena's suggestion

* Apply Fortune's suggestion

* Add Sizing requirements as a prereq for RHDH installation

---------

Co-authored-by: GitHub Actions <[email protected]>

* Update installation prerequisite

---------

Co-authored-by: GitHub Actions <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants