Integration Branch: Rebased ok no 1.9 by gwynnemonahan · Pull Request #95552 · openshift/openshift-docs

gwynnemonahan · 2025-07-02T16:20:30Z

Integration Branch for release branch no-1.9

This PR integrates all commits to the no-1.9 release branch with main and enterprise-4.12, enterprise-4.14, enterprise-4.16+

All commits in this PR have been SME/QE, Peer and merge reviewed. This PR is for merging only.

Version(s):
Cherry-pick to OCP 4.12, 4.14, 4.16+

QE review:

QE has approved this change. All content in this release branch has been peer review/merge review/QE/SME ack'd before it was merged into the no-1.9 branch. This PR simply integrates all that merged content into main and enterprise-4.12, enterprise-4.14, enterprise-4.16+ on NetObserv GA, 7/02/25.

Additional information:

ocpdocs-previewbot · 2025-07-02T16:37:07Z

🤖 Wed Jul 02 16:37:06 - Prow CI generated the docs preview:

ocpdocs-vale-bot · 2025-07-02T16:39:14Z

 | `Flags`
 | string[]
-| List of TCP flags comprised in the flow, according to RFC-9293, with additional custom flags to represent the following per-packet combinations: +
+| List of TCP flags comprised in the flow, as per RFC-9293, with additional custom flags to represent the following per-packet combinations: +


🤖 [error] RedHat.TermsErrors: Use 'according to', 'as', or 'as in' rather than 'as per'. For more information, see RedHat.TermsErrors.

ocpdocs-vale-bot · 2025-07-02T16:39:22Z

+//eBPF Manager Operator in OCP > Networking
+[role="_additional-resources"]
+.Additional resources
+* xref:../../networking/networking_operators/ebpf_manager/ebpf-manager-operator-install.adoc[Installing the eBPF Manager Operator]


🤖 [error] OpenShiftAsciiDoc.XrefContainsAnchorID: The xref is missing an anchor ID.

openshift-ci · 2025-07-02T16:39:29Z

@gwynnemonahan: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

kalexand-rh · 2025-07-02T16:58:44Z

Going to merge without squashing to preserve commit history. Gwynne confirmed that the list of PRs seemed correct but will validate that all content is present when it goes live and open followups as required.

kalexand-rh · 2025-07-02T17:00:05Z

/cherrypick enterprise-4.20 enterprise-4.19 enterprise-4.18 enterprise-4.17 enterprise-4.16 enterprise-4.14 enterprise-4.12

openshift-cherrypick-robot · 2025-07-02T17:00:55Z

@kalexand-rh: new pull request created: #95556

Details

In response to this:

/cherrypick enterprise-4.20 enterprise-4.19 enterprise-4.18 enterprise-4.17 enterprise-4.16 enterprise-4.14 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.

kalexand-rh · 2025-07-02T18:08:09Z

/cherrypick enterprise-4.19

kalexand-rh · 2025-07-02T18:08:16Z

/cherrypick enterprise-4.18

kalexand-rh · 2025-07-02T18:08:24Z

/cherrypick enterprise-4.17

kalexand-rh · 2025-07-02T18:08:33Z

/cherrypick enterprise-4.16

kalexand-rh · 2025-07-02T18:08:40Z

/cherrypick enterprise-4.14

openshift-cherrypick-robot · 2025-07-02T18:08:58Z

@kalexand-rh: new pull request created: #95557

Details

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.

kalexand-rh · 2025-07-02T18:08:59Z

/cherrypick enterprise-4.12

openshift-cherrypick-robot · 2025-07-02T18:09:04Z

@kalexand-rh: new pull request created: #95558

Details

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 · 2025-07-02T18:09:12Z

@kalexand-rh: new pull request created: #95559

Details

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 · 2025-07-02T18:09:18Z

@kalexand-rh: #95552 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-14786 Add section for IPsec
.git/rebase-apply/patch:582: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	observability/network_observability/observing-network-traffic.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/observing-network-traffic.adoc
CONFLICT (content): Merge conflict in observability/network_observability/observing-network-traffic.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-14786 Add section for IPsec

Details

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.

openshift-cherrypick-robot · 2025-07-02T18:09:27Z

@kalexand-rh: #95552 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS-14786 Add section for IPsec
.git/rebase-apply/patch:582: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	observability/network_observability/observing-network-traffic.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/observing-network-traffic.adoc
CONFLICT (content): Merge conflict in observability/network_observability/observing-network-traffic.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-14786 Add section for IPsec

Details

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 · 2025-07-02T18:09:44Z

@kalexand-rh: #95552 failed to apply on top of branch "enterprise-4.12":

Applying: OSDOCS-14786 Add section for IPsec
.git/rebase-apply/patch:582: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/network-observability-multitenancy.adoc
M	observability/network_observability/observing-network-traffic.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/observing-network-traffic.adoc
CONFLICT (content): Merge conflict in observability/network_observability/observing-network-traffic.adoc
Auto-merging modules/network-observability-multitenancy.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-14786 Add section for IPsec

Details

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.

gwynnemonahan added 6 commits July 2, 2025 11:17

[NETOBSERV] OSDOCS-14786 Add section for IPsec

09f5f22

Merge review changes (Squash)

628014d

OSDOCS-10882 [NETOBSERV] bpfman Support TP

60c3a81

OSDOCS-14941 [NETOBSERV] Update API/CLI references

b1ba6dd

OSDOCS-15120 [NETOBSERV] Update admin/dev preview language in Overview

1a92535

OSDOCS-14862 NETOBSERV 1.9 Features, Bugs, Known Issues

e298598

openshift-ci Bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jul 2, 2025

ocpdocs-vale-bot reviewed Jul 2, 2025

View reviewed changes

kalexand-rh merged commit 33f9995 into openshift:main Jul 2, 2025
2 checks passed

openshift-cherrypick-robot mentioned this pull request Jul 2, 2025

[enterprise-4.20] Integration Branch: Rebased ok no 1.9 #95556

Merged

openshift-cherrypick-robot mentioned this pull request Jul 2, 2025

[enterprise-4.19] Integration Branch: Rebased ok no 1.9 #95557

Merged

openshift-cherrypick-robot mentioned this pull request Jul 2, 2025

[enterprise-4.18] Integration Branch: Rebased ok no 1.9 #95558

Merged

openshift-cherrypick-robot mentioned this pull request Jul 2, 2025

[enterprise-4.17] Integration Branch: Rebased ok no 1.9 #95559

Merged

mburke5678 mentioned this pull request Aug 6, 2025

[enterprise-4.15] OSDOCS-15287 [NETOBSERV] Line breaks for observing-network-traffic.adoc assembly and its includes #97247

Merged

Conversation

gwynnemonahan commented Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ocpdocs-previewbot commented Jul 2, 2025

Uh oh!

ocpdocs-vale-bot Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

ocpdocs-vale-bot Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Jul 2, 2025

Uh oh!

kalexand-rh commented Jul 2, 2025

Uh oh!

Uh oh!

kalexand-rh commented Jul 2, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 2, 2025

Uh oh!

kalexand-rh commented Jul 2, 2025

Uh oh!

kalexand-rh commented Jul 2, 2025

Uh oh!

kalexand-rh commented Jul 2, 2025

Uh oh!

kalexand-rh commented Jul 2, 2025

Uh oh!

kalexand-rh commented Jul 2, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 2, 2025

Uh oh!

kalexand-rh commented Jul 2, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 2, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 2, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 2, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 2, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 2, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

gwynnemonahan commented Jul 2, 2025 •

edited

Loading