Skip to content

Conversation

@gwynnemonahan
Copy link
Contributor

@gwynnemonahan gwynnemonahan commented Nov 13, 2025

OSDOCS-15828 [NETOBSERV] Refactor release notes 1.7

Version(s):
4.12, 4.14+

Issue:
https://issues.redhat.com/browse/OSDOCS-15828

Link to docs preview:

QE review:
QE is not required for this PR. This PR modularizes Network Observability Operator release notes for 1.3.0 only. There are no content changes.

Additional information:

  • For 1.7.0, per new guidance, there is an exception for xrefs in release notes modules. xrefs have been left as they are. There is a separate Jira to update xrefs in all newly created Network Observability Operator release note modules.
  • The Network Observability Operator release notes are being modularized through a series of PRs. This means that things will get cleaned up and consolidated along the way.
  • Some of these PRs may contain updates to previously merged content for the purpose of consistency.
  • The network-observability-release-notes.adoc file will dwindle with each PR while the network-observability-operator-release-notes-archive.adoc file will grow.
    In as many cases as possible, such as:
    [id="network-observability-channel-removal-1.4_{context}"]
    == Channel removal
    existing ID in network-observability-release-notes.adoc has been used in the new module.
  • Since not all content applies to every OCP branch, it is possible there will be cherry-pick failures. This will likely apply to release notes since it has been 1 assembly file and not all content is applicable to all OCP branches.
  • I will manually verify content on each breach, and create manual cherry-picks accordingly.


  • By this PR:
    • Rel notes for 1.1.0-1.6.2 including all z-streams, have been modularized.
      • 38 new modules have been created for 1.1.0-1.6.2 including all z-streams.
    • Rel notes for 1.8.0, 1.8.1, 1.9.0, and 1.9.1 remain.
    • Rel notes for 1.9.2, 1.9.3, and 1.10.0 were modularized from the start as they were released when the new format was announced.
    • 1.9.2 and 1.9.3 are already in release_notes_archive
    • 1.10.0 can be moved to release_notes until 1.10.1
    • 1.10.1 modules will replace 1.10.0 modules in release_notes
    • 1.10.0 modules will be moved to release_notes_archive
    • Update stub to point to release_notes

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 13, 2025
@gwynnemonahan gwynnemonahan force-pushed the OSDOCS-15828 branch 2 times, most recently from 6e85dd8 to 22d3570 Compare November 13, 2025 21:27
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 13, 2025
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 13, 2025
@gwynnemonahan
Copy link
Contributor Author

Rebased 11/13/2025 PM. Captured updates from 1.6.1, 1.6.2 in #102457

@openshift-ci
Copy link

openshift-ci bot commented Nov 13, 2025

@gwynnemonahan: 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-sigs/prow repository. I understand the commands that are listed here.

@gwynnemonahan
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 Nov 13, 2025
@bscott-rh bscott-rh added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Nov 14, 2025
@bscott-rh bscott-rh merged commit 5290a08 into openshift:main Nov 14, 2025
2 checks passed
@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.21

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.20

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.19

@openshift-cherrypick-robot

@bscott-rh: new pull request created: #102552

In response to this:

/cherrypick enterprise-4.21

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

@bscott-rh: new pull request created: #102553

In response to this:

/cherrypick enterprise-4.20

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

@bscott-rh: new pull request created: #102554

In response to this:

/cherrypick enterprise-4.19

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.

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.18

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.17

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@bscott-rh: new pull request could not be created: failed to create pull request against openshift/openshift-docs#enterprise-4.21 from head openshift-cherrypick-robot:cherry-pick-102480-to-enterprise-4.21: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-102480-to-enterprise-4.21."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request","status":"422"}

In response to this:

/cherrypick enterprise-4.21

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

@bscott-rh: new pull request created: #102558

In response to this:

/cherrypick enterprise-4.18

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

@bscott-rh: new pull request created: #102559

In response to this:

/cherrypick enterprise-4.17

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

@bscott-rh: new pull request created: #102560

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

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.15

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.14

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.12

@openshift-cherrypick-robot

@bscott-rh: #102480 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-15828 [NETOBSERV] Refactor release notes 1.7
Using index info to reconstruct a base tree...
M	observability/network_observability/network-observability-operator-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (content): Merge conflict in observability/network_observability/network-observability-operator-release-notes.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 OSDOCS-15828 [NETOBSERV] Refactor release notes 1.7

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

@openshift-cherrypick-robot

@bscott-rh: #102480 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS-15828 [NETOBSERV] Refactor release notes 1.7
Using index info to reconstruct a base tree...
M	observability/network_observability/network-observability-operator-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (content): Merge conflict in observability/network_observability/network-observability-operator-release-notes.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 OSDOCS-15828 [NETOBSERV] Refactor release notes 1.7

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

@openshift-cherrypick-robot

@bscott-rh: #102480 failed to apply on top of branch "enterprise-4.12":

Applying: OSDOCS-15828 [NETOBSERV] Refactor release notes 1.7
Using index info to reconstruct a base tree...
M	observability/network_observability/network-observability-operator-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (content): Merge conflict in observability/network_observability/network-observability-operator-release-notes.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 OSDOCS-15828 [NETOBSERV] Refactor release notes 1.7

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

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.

6 participants