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

OCPBUGS-30076: Fixed minor bugs with OCI docs post 4.15 #72364

Merged
merged 1 commit into from
Apr 16, 2024

Conversation

dfitzmau
Copy link
Contributor

@dfitzmau dfitzmau commented Feb 29, 2024

Version(s):
4.14-4.16

Issue:
OCPBUGS-30076
OCPBUGS-30322

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

Additional information:
Google doc customer feedback - AI
Google doc customer feedback - ABI
AI screenshots
Diagram ideas
Add diagram here also

Considerations:

  • For the term "CSI", would Oracle refer to the term as the Oracle CSI for File or Oracle CSI for File Storage?

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 29, 2024
@openshift-ci-robot
Copy link

@dfitzmau: This pull request references Jira Issue OCPBUGS-30076, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 29, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Feb 29, 2024

🤖 Tue Apr 16 10:39:39 - Prow CI generated the docs preview:
https://72364--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@dfitzmau dfitzmau force-pushed the OCPBUGS-30076 branch 2 times, most recently from 55b828d to 822713c Compare February 29, 2024 10:29
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 29, 2024
@dfitzmau dfitzmau force-pushed the OCPBUGS-30076 branch 2 times, most recently from 7f40f26 to 428da08 Compare February 29, 2024 10:33
@dfitzmau dfitzmau force-pushed the OCPBUGS-30076 branch 3 times, most recently from 21b3e3d to 876010f Compare February 29, 2024 15:35
@kalexand-rh kalexand-rh changed the title OCPBUGS-30076: Fixed minor bugs with OCI docs post 4.15 OCPBUGS#30076: Fixed minor bugs with OCI docs post 4.15 Mar 4, 2024
@openshift-ci-robot openshift-ci-robot removed jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 4, 2024
@openshift-ci-robot
Copy link

@dfitzmau: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

In response to this:

Version(s):
4.15 and 4.16

Issue:
OCPBUGS-30076

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

Additional information:

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.

@pawanpinjarkar
Copy link

Please update the PR title to OCPBUGS-30076 and run /jira refresh

@dfitzmau dfitzmau changed the title OCPBUGS#30076: Fixed minor bugs with OCI docs post 4.15 OCPBUGS-30076: Fixed minor bugs with OCI docs post 4.15 Mar 5, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 5, 2024
@openshift-ci-robot
Copy link

@dfitzmau: This pull request references Jira Issue OCPBUGS-30076, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Version(s):
4.14-4.16

Issue:
OCPBUGS-30076

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

Additional information:

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.

@dfitzmau
Copy link
Contributor Author

dfitzmau commented Mar 5, 2024

/jira refresh

@openshift-ci-robot
Copy link

@dfitzmau: This pull request references Jira Issue OCPBUGS-30076, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@dfitzmau dfitzmau force-pushed the OCPBUGS-30076 branch 2 times, most recently from b8b58c8 to e0c926b Compare April 16, 2024 10:25
Copy link

openshift-ci bot commented Apr 16, 2024

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

@dfitzmau
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 Apr 16, 2024
@jab-rh
Copy link
Contributor

jab-rh commented Apr 16, 2024

@dfitzmau, PR mentions 4.14+, but the labels are 4.15 and 4.16. Can you confirm if this also belongs in 4.14? Thanks!

@jab-rh jab-rh merged commit c2c25e6 into openshift:main Apr 16, 2024
3 checks passed
@openshift-ci-robot
Copy link

@dfitzmau: Jira Issue OCPBUGS-30076 is in an unrecognized state (Verified) and will not be moved to the MODIFIED state.

In response to this:

Version(s):
4.14-4.16

Issue:
OCPBUGS-30076
OCPBUGS-30322

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

Additional information:
Google doc customer feedback - AI
Google doc customer feedback - ABI
AI screenshots
Diagram ideas
Add diagram here also

Considerations:

  • For the term "CSI", would Oracle refer to the term as the Oracle CSI for File or Oracle CSI for File Storage?

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.

@jab-rh
Copy link
Contributor

jab-rh commented Apr 16, 2024

/cherry-pick enterprise-4.16

@jab-rh
Copy link
Contributor

jab-rh commented Apr 16, 2024

/cherry-pick enterprise-4.15

@openshift-cherrypick-robot

@jab-rh: #72364 failed to apply on top of branch "enterprise-4.16":

Applying: OCPBUGS-30076: Fixed minor bugs with OCI docs post 4.15
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	contributing_to_docs/term_glossary.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
Removing modules/verifying-cluster-install-oci.adoc
Auto-merging contributing_to_docs/term_glossary.adoc
CONFLICT (content): Merge conflict in contributing_to_docs/term_glossary.adoc
Auto-merging _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.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-30076: Fixed minor bugs with OCI docs post 4.15
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 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.

@openshift-cherrypick-robot

@jab-rh: #72364 failed to apply on top of branch "enterprise-4.15":

Applying: OCPBUGS-30076: Fixed minor bugs with OCI docs post 4.15
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	contributing_to_docs/term_glossary.adoc
Falling back to patching base and 3-way merge...
Removing modules/verifying-cluster-install-oci.adoc
Auto-merging contributing_to_docs/term_glossary.adoc
CONFLICT (content): Merge conflict in contributing_to_docs/term_glossary.adoc
Auto-merging _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.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-30076: Fixed minor bugs with OCI docs post 4.15
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 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.

@jab-rh
Copy link
Contributor

jab-rh commented Apr 16, 2024

@dfitzmau, looks like these don't merge cleanly; it should merge cleanly into 4.16 though.

@bergerhoffer, I wonder if this needs a revert?

@dfitzmau
Copy link
Contributor Author

@dfitzmau, looks like these don't merge cleanly; it should merge cleanly into 4.16 though.

@bergerhoffer, I wonder if this needs a revert?

I think it's OK. The difference is among the term_glossary file entries where I ddi modify this file as part of this PR (PM request).

Screenshot from 2024-04-17 09-40-46


// The Assisted Installer and OCI overview
include::modules/installing-oci-about-assisted-installer.adoc[leveloffset=+1]

[role="_additional-resources"]
.Additional resources

* link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2024[Assisted Installer for {product-title}]
* link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2024[{ai-full} for {product-title}]
Copy link
Contributor

Choose a reason for hiding this comment

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

I recommend removing the version (2024) so that the link does not have to be updated when the version changes in 2025.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. For a follow-up PR. I need to address merge conflicts on 4.14-4.16

* link:https://docs.oracle.com/en-us/iaas/Content/ResourceManager/Concepts/resourcemanager.htm#ways[Ways to access Resource Manager]
* link:https://docs.oracle.com/en-us/iaas/Content/ResourceManager/Tasks/create-stack.htm#top[Creating a stack] in the Oracle documentation.
* xref:../../installing/installing_on_prem_assisted/installing-on-prem-assisted.adoc#using-the-assisted-installer_installing-on-prem-assisted[Installing an on-premise cluster using the {ai-full}]
* link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2022/html-single/assisted_installer_for_openshift_container_platform/index[{ai-full} for {product-title}]
Copy link
Contributor

Choose a reason for hiding this comment

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

This link needs to be updated.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. For a follow-up PR. I need to address merge conflicts on 4.14-4.16

+
[IMPORTANT]
====
Before, you can continue to the next steps, wait for each node to reach the `Ready` status.
====

. Accept the default settings for the **Storage** and **Networking** steps. Click the **Next** button to go to the **Custom manifests** step.
. Accept the default settings for the *Storage* and *Networking* steps, and then Click *Next*.
Copy link
Contributor

Choose a reason for hiding this comment

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

typo: "Click"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. For a follow-up PR. I need to address merge conflicts on 4.14-4.16

<4> The URL of the server where you want to upload the `rootfs` image.

. Apply one of the following two updates to your `agent-config.yaml` configuration file:
+
* For a disconnected network: After you run the command to generate a minimal ISO Image, the Agent-based installer saves the `rootfs` image into the `./<installation_directory>/boot-artifacts` directory on your local system. Upload `rootfs` to the location stated in the `bootArtifactsBaseURL` parameter in the `agent-config.yaml` configuration file.
* For a disconnected network: After you run the command to generate a minimal ISO Image, the Agent-based installer saves the `rootfs` image into the `./<installation_directory>/boot-artifacts` directory on your local system. Use your preferred web server, such as any Hypertext Transfer Protocol daemon (`httpd`), to upload `rootfs` to the location stated in the `bootArtifactsBaseURL` parameter in the `agent-config.yaml` configuration file.
Copy link
Contributor

Choose a reason for hiding this comment

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

AFAIK, rootfs is only marked with backticks when it is used as a directory name. In this context, it is the name of the discovery image, so it should not be surrounded by backticks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. For a follow-up PR. I need to address merge conflicts on 4.14-4.16

@jab-rh jab-rh removed the merge-review-needed Signifies that the merge review team needs to review this PR label Apr 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.15 branch/enterprise-4.16 jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet