OCPBUGS-31247: Remove "(for user-provisioned installations)" reference

[palonsoro]

This PR removes the above mentioned parenthesis from the etcd restore procedure, because it goes against documentation guidelines of avoiding parenthesis. It also improves the technical description of the CSRs mentioned at that step.

Version(s):
4.16,4.15, 4.14

Issue:
https://issues.redhat.com/browse/OCPBUGS-31247

Link to docs preview:

https://73512--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state

QE review:

• QE has approved this change.

Additional information:

(none)

[openshift-ci-robot]

@palonsoro: This pull request references Jira Issue OCPBUGS-31247, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.16.0) matches configured target version for branch (4.16.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @geliu2016

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This PR removes the above mentioned parenthesis from the etcd restore procedure, because it goes against documentation guidelines of avoiding parenthesis. It also improves the technical description of the CSRs mentioned at that step.

Version(s):
4.15, 4.14

Issue:
https://issues.redhat.com/browse/OCPBUGS-31247

Link to docs preview:
(not ready yet)

QE review:

• QE has approved this change.

Additional information:

(none)

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 openshift-eng/jira-lifecycle-plugin repository.

[geliu2016]

/lgtm

[ocpdocs-previewbot]

🤖 Thu Mar 21 10:29:23 - Prow CI generated the docs preview:
https://73512--ocpdocs-pr.netlify.app

[openshift-ci]

New changes are detected. LGTM label has been removed.

[openshift-ci-robot]

@palonsoro: This pull request references Jira Issue OCPBUGS-31247, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.16.0) matches configured target version for branch (4.16.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @geliu2016

In response to this:

This PR removes the above mentioned parenthesis from the etcd restore procedure, because it goes against documentation guidelines of avoiding parenthesis. It also improves the technical description of the CSRs mentioned at that step.

Version(s):
4.15, 4.14

Issue:
https://issues.redhat.com/browse/OCPBUGS-31247

Link to docs preview:
(not ready yet)

QE review:

• QE has approved this change.

Additional information:

(none)

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 openshift-eng/jira-lifecycle-plugin repository.

[palonsoro]

/retest

[openshift-ci]

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

[palonsoro]

/label peer-review-needed

[palonsoro]

Note: The only change I made since @geliu2016 reviewed is adding a missing space, so I understand that QE should not need to review again. If it is needed, please let us know.

Thanks.

[kcarmichael08]

LGTM! I assume this should also go in 4.16 (upcoming) - if so, please edit the PR body to reflect that and the merge reviewer can add the label for that. Thanks!

[palonsoro]

You are right @kcarmichael08 . I fixed PR body.

Thanks!

[palonsoro]

/label merge-review-needed

[ShaunaDiaz]

/remove-label merge-review-needed

[openshift-ci-robot]

@palonsoro: Jira Issue OCPBUGS-31247: All pull requests linked via external trackers have merged:

• openshift/openshift-docs#73512

Jira Issue OCPBUGS-31247 has been moved to the MODIFIED state.

In response to this:

This PR removes the above mentioned parenthesis from the etcd restore procedure, because it goes against documentation guidelines of avoiding parenthesis. It also improves the technical description of the CSRs mentioned at that step.

Version(s):
4.16,4.15, 4.14

Issue:
https://issues.redhat.com/browse/OCPBUGS-31247

Link to docs preview:

https://73512--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state

QE review:

• QE has approved this change.

Additional information:

(none)

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 openshift-eng/jira-lifecycle-plugin repository.

[ShaunaDiaz]

/cherrypick enterprise-4.14

[ShaunaDiaz]

/cherrypick enterprise-4.15

[ShaunaDiaz]

/cherrypick enterprise-4.16

[openshift-cherrypick-robot]

@ShaunaDiaz: #73512 failed to apply on top of branch "enterprise-4.14":

Applying: OCPBUGS-31247: Remove "(for user-provisioned installations)" reference for accepting CSRs on etcd restore procedure
Using index info to reconstruct a base tree...
M	modules/dr-restoring-cluster-state.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/dr-restoring-cluster-state.adoc
CONFLICT (content): Merge conflict in modules/dr-restoring-cluster-state.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 OCPBUGS-31247: Remove "(for user-provisioned installations)" reference for accepting CSRs on etcd restore procedure
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.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]

@ShaunaDiaz: #73512 failed to apply on top of branch "enterprise-4.15":

Applying: OCPBUGS-31247: Remove "(for user-provisioned installations)" reference for accepting CSRs on etcd restore procedure
Using index info to reconstruct a base tree...
M	modules/dr-restoring-cluster-state.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/dr-restoring-cluster-state.adoc
CONFLICT (content): Merge conflict in modules/dr-restoring-cluster-state.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 OCPBUGS-31247: Remove "(for user-provisioned installations)" reference for accepting CSRs on etcd restore procedure
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.15

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]

@ShaunaDiaz: #73512 failed to apply on top of branch "enterprise-4.16":

Applying: OCPBUGS-31247: Remove "(for user-provisioned installations)" reference for accepting CSRs on etcd restore procedure
Using index info to reconstruct a base tree...
M	modules/dr-restoring-cluster-state.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/dr-restoring-cluster-state.adoc
CONFLICT (content): Merge conflict in modules/dr-restoring-cluster-state.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 OCPBUGS-31247: Remove "(for user-provisioned installations)" reference for accepting CSRs on etcd restore procedure
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.16

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.

[ShaunaDiaz]

Hey @palonsoro, it looks like all three branch cherry picks failed for #73512. You can create manual CPs that resolve the conflicts and then let me or the merge review team know and we can merge those up for you.

[ShaunaDiaz]

/cherrypick enterprise-4.16

[openshift-cherrypick-robot]

@ShaunaDiaz: new pull request created: #73610

In response to this:

/cherrypick enterprise-4.16

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.

[ShaunaDiaz]

#73486 had unmerged cherry picks

[ShaunaDiaz]

/cherrypick enterprise-4.15

[ShaunaDiaz]

/cherrypick enterprise-4.14

[palonsoro]

Thanks @ShaunaDiaz

[openshift-cherrypick-robot]

@ShaunaDiaz: new pull request created: #73611

In response to this:

/cherrypick enterprise-4.15

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]

@ShaunaDiaz: new pull request created: #73612

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.