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.

Sign up for GitHub

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

Jump to bottom

OBSDOCS-760: Update structure of resource scheduling docs #70879

Merged
merged 1 commit into from
Feb 6, 2024
Merged

OBSDOCS-760: Update structure of resource scheduling docs #70879

merged 1 commit into from
Feb 6, 2024

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Jan 26, 2024 •
edited

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 26, 2024 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-760 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

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-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 26, 2024
@abrennan89 abrennan89 added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 26, 2024
@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 26, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jan 26, 2024 •
edited

🤖 Tue Feb 06 19:44:24 - Prow CI generated the docs preview: https://70879--ocpdocs-pr.netlify.app

@abrennan89 abrennan89 force-pushed the scheduling branch 4 times, most recently from 1eb9016 to 7964a63 Compare January 29, 2024 18:41
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 29, 2024 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-760 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

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.

@abrennan89 abrennan89 added this to the Continuous Release milestone Jan 29, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 29, 2024 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-760 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

Issue:
https://issues.redhat.com/browse/OBSDOCS-760

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.

@abrennan89 abrennan89 changed the title [WIP] OBSDOCS-760: Update structure of resource scheduling docs OBSDOCS-760: Update structure of resource scheduling docs Jan 30, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 30, 2024
@openshift-ci openshift-ci bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 2, 2024
adellape
adellape reviewed Feb 6, 2024
View reviewed changes
Copy link
Contributor

@adellape adellape left a comment

Choose a reason for hiding this comment

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

Looks cool! Only a few nits.

I saw some other issues in moved-around content outside of the scope of this PR (infrastructure-moving-logging and nodes-scheduler-taints-tolerations-about come to mind, in case there are more follow-ups to come), but for the sake of this restructuring PR: 👍!

modules/cluster-logging-collector-tolerations.adoc Outdated Show resolved Hide resolved
modules/cluster-logging-kibana-tolerations.adoc Outdated Show resolved Hide resolved
modules/cluster-logging-logstore-tolerations.adoc 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 Feb 6, 2024
@abrennan89 abrennan89 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 6, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Feb 6, 2024

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

@abrennan89 abrennan89 merged commit 4422bfc into openshift:main Feb 6, 2024
2 checks passed
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.11

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.12

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.13

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.15

@openshift-cherrypick-robot
Copy link

@abrennan89: #70879 failed to apply on top of branch "enterprise-4.11":

Applying: OBSDOCS-760: Update structure of resource scheduling docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	logging/config/cluster-logging-moving-nodes.adoc
M	logging/config/cluster-logging-tolerations.adoc
M	modules/nodes-scheduler-node-selectors-about.adoc
M	nodes/scheduling/nodes-scheduler-node-selectors.adoc
Falling back to patching base and 3-way merge...
Auto-merging nodes/scheduling/nodes-scheduler-node-selectors.adoc
Auto-merging modules/nodes-scheduler-node-selectors-about.adoc
Removing modules/cluster-logging-elasticsearch-tolerations.adoc
CONFLICT (modify/delete): logging/config/cluster-logging-tolerations.adoc deleted in OBSDOCS-760: Update structure of resource scheduling docs and modified in HEAD. Version HEAD of logging/config/cluster-logging-tolerations.adoc left in tree.
CONFLICT (modify/delete): logging/config/cluster-logging-moving-nodes.adoc deleted in OBSDOCS-760: Update structure of resource scheduling docs and modified in HEAD. Version HEAD of logging/config/cluster-logging-moving-nodes.adoc left in tree.
Auto-merging _topic_maps/_topic_map_rosa.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-760: Update structure of resource scheduling docs
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.11

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 openshift-cherrypick-robot mentioned this pull request Feb 6, 2024
Closed
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #71268

In response to this:

/cherrypick enterprise-4.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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 6, 2024
Closed
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #71269

In response to this:

/cherrypick enterprise-4.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.

@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #71270

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.

This was referenced Feb 6, 2024
Merged
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #71271

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.

This was referenced Feb 6, 2024
Merged
Merged
Merged
bscott-rh added a commit to bscott-rh/openshift-docs that referenced this pull request Feb 6, 2024
@bscott-rh
Logging redirects per openshift#70879
8bc75b5
@bscott-rh bscott-rh mentioned this pull request Feb 6, 2024
Merged
bscott-rh added a commit to bscott-rh/openshift-docs that referenced this pull request Feb 7, 2024
@bscott-rh
Logging redirects per openshift#70879
8e00373
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adellape adellape adellape left review comments

@jcantrill jcantrill jcantrill left review comments

@anpingli anpingli anpingli left review comments

Assignees

@adellape adellape

@anpingli anpingli

Labels
branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs 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
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@abrennan89 @openshift-ci-robot @ocpdocs-previewbot @anpingli @openshift-cherrypick-robot @adellape @jcantrill