Skip to content

Conversation

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 3, 2025
@kquinn1204 kquinn1204 changed the title TELCODOCS-2477 TELCODOCS-2537 Egress documentation not clear Oct 6, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 11, 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 Oct 24, 2025
Comment on lines 48 to 51
ifndef::openshift-rosa,openshift-rosa-hcp[]
// The egressIPConfig object
include::modules/nw-egress-ips-config-object.adoc[leveloffset=+1]
endif::openshift-rosa,openshift-rosa-hcp[]
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove this and delete .adoc file?


ifndef::openshift-rosa,openshift-rosa-hcp[]
// The egressIPConfig object
include::modules/nw-egress-ips-config-object.adoc[leveloffset=+1]
Copy link
Contributor

Choose a reason for hiding this comment

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

File hasn't been deleted yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let me try again not sure what is going on.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it is now @cgoncalves

Copy link
Contributor

Choose a reason for hiding this comment

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

No, it's not. The file still exists. Just to be clear, I'm talking about the file itself, not it being included in the doc.

@cgoncalves
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 3, 2025
@lcavalle
Copy link
Contributor

lcavalle commented Nov 4, 2025

/lgtm I have added a couple of suggestions and minor changes. Great work!

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 5, 2025
@openshift-ci
Copy link

openshift-ci bot commented Nov 5, 2025

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

@huiran0826
Copy link

/lgtm

@slovern slovern added this to the Continuous Release milestone Nov 7, 2025
@slovern slovern merged commit d6746db into openshift:main Nov 7, 2025
2 checks passed
@slovern
Copy link
Contributor

slovern commented Nov 7, 2025

/cherrypick enterprise-4.21

@slovern
Copy link
Contributor

slovern commented Nov 7, 2025

/cherrypick enterprise-4.20

@slovern
Copy link
Contributor

slovern commented Nov 7, 2025

/cherrypick enterprise-4.19

@slovern
Copy link
Contributor

slovern commented Nov 7, 2025

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@slovern: new pull request created: #102016

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

@slovern: new pull request created: #102017

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

@slovern: new pull request created: #102018

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.

@openshift-cherrypick-robot

@slovern: #99999 failed to apply on top of branch "enterprise-4.18":

Applying: TELCODOCS-2477
Using index info to reconstruct a base tree...
M	networking/ovn_kubernetes_network_provider/configuring-egress-ips-ovn.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/ovn_kubernetes_network_provider/configuring-egress-ips-ovn.adoc
CONFLICT (content): Merge conflict in networking/ovn_kubernetes_network_provider/configuring-egress-ips-ovn.adoc
Removing modules/nw-egress-ips-config-object.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 TELCODOCS-2477

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants