Skip to content

Conversation

@stevsmit
Copy link
Member

@stevsmit stevsmit commented Aug 29, 2024

This is a manual cherry pick of both f328ff3 and 0d14457. This content of this PR does not exactly match its cherry picks. The content of this PR does match the content that currently exists in OCP docs version 4.16, as it should. I used these original PRs as a base and then copied the content from each module from version 4.16.

For review: I suggest comparing this PR to the modules in 4.16. Changes suggested to this PR would need to be done in 4.16 and then cherry-picked back to 4.15, because the content must match.

tl;dr: it is a direct copy of content that exists in version 4.16.

Preview: https://81120--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.html

Version(s):
4.15

Issue:
Jira: https://issues.redhat.com/browse/OSDOCS-11834

Link to docs preview:

QE review:

  • QE has approved this change.

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 29, 2024
@stevsmit stevsmit force-pushed the 11834-live-migration-proc-backport branch from 5a57ace to 7c55bfc Compare August 29, 2024 18:47
@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 Aug 29, 2024
@stevsmit stevsmit force-pushed the 11834-live-migration-proc-backport branch 2 times, most recently from c827292 to 12d3525 Compare August 29, 2024 19:19
@stevsmit stevsmit force-pushed the 11834-live-migration-proc-backport branch 2 times, most recently from 4412a4c to 6935ac5 Compare August 29, 2024 19:43
@stevsmit stevsmit force-pushed the 11834-live-migration-proc-backport branch 4 times, most recently from 959d428 to 576cda2 Compare September 4, 2024 14:09
@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 4, 2024
@stevsmit stevsmit force-pushed the 11834-live-migration-proc-backport branch from 576cda2 to cf80199 Compare September 4, 2024 14:59
@stevsmit stevsmit added this to the Continuous Release milestone Sep 4, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 8, 2024
@stevsmit stevsmit force-pushed the 11834-live-migration-proc-backport branch from cf80199 to d3712ef Compare October 10, 2024 19:33
@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 10, 2024
@stevsmit stevsmit force-pushed the 11834-live-migration-proc-backport branch from d3712ef to 2322b2b Compare October 10, 2024 19:40
@zhaozhanqi
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 11, 2024
@pliurh
Copy link
Contributor

pliurh commented Oct 11, 2024

LGTM

@stevsmit stevsmit added the peer-review-needed Signifies that the peer review team needs to review this PR label Oct 11, 2024
Updates limited live migration procedure to find various resources

Multicast enabled namespaces change

Further changes
@stevsmit stevsmit force-pushed the 11834-live-migration-proc-backport branch from 2322b2b to f7900ce Compare October 11, 2024 12:37
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 11, 2024
@openshift-ci
Copy link

openshift-ci bot commented Oct 11, 2024

New changes are detected. LGTM label has been removed.

@openshift-ci
Copy link

openshift-ci bot commented Oct 11, 2024

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

@adellape adellape added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Oct 11, 2024
@adellape adellape self-assigned this Oct 11, 2024
.Procedure

. As an {product-title} cluster administrator, check for egress firewall resources. You can do this by using the `oc` CLI, or by using the {product-title} web console.
Copy link
Contributor

Choose a reason for hiding this comment

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

Colon leading into substeps, per ISG.

Suggested change
. As an {product-title} cluster administrator, check for egress firewall resources. You can do this by using the `oc` CLI, or by using the {product-title} web console.
. As an {product-title} cluster administrator, check for egress firewall resources. You can do this by using the `oc` CLI, or by using the {product-title} web console:


. As an {product-title} cluster administrator, check for egress firewall resources. You can do this by using the `oc` CLI, or by using the {product-title} web console.

.. To check for egress firewall resource by using the `oc` CLI tool:
Copy link
Contributor

Choose a reason for hiding this comment

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

This and line 65 could be unordered, no? Since you choose either one (or both)?

Suggested change
.. To check for egress firewall resource by using the `oc` CLI tool:
* To check for egress firewall resource by using the `oc` CLI tool:

+
Ensure that the behavior of this resource is intended because it could have changed after migration. For more information about egress firewalls, see "Configuring an egress firewall for a project".

.. To check for egress firewall resources by using the {product-title} web console:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
.. To check for egress firewall resources by using the {product-title} web console:
* To check for egress firewall resources by using the {product-title} web console:

Comment on lines +71 to +73
. Check your cluster for egress IP resources. You can do this by using the `oc` CLI, or by using the {product-title} web console.

.. To check for egress IPs by using the `oc` CLI tool:
Copy link
Contributor

Choose a reason for hiding this comment

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

Same:

Suggested change
. Check your cluster for egress IP resources. You can do this by using the `oc` CLI, or by using the {product-title} web console.
.. To check for egress IPs by using the `oc` CLI tool:
. Check your cluster for egress IP resources. You can do this by using the `oc` CLI, or by using the {product-title} web console:
* To check for egress IPs by using the `oc` CLI tool:

+
Repeat this for all egress IPs. Ensure that the behavior of each resource is intended because it could have changed after migration. For more information about EgressIPs, see "Configuring an EgressIP address".

.. To check for egress IPs by using the {product-title} web console:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
.. To check for egress IPs by using the {product-title} web console:
* To check for egress IPs by using the {product-title} web console:

Comment on lines +11 to +12
* `100.64.0.0/16`. This IP address range is used for the `internalJoinSubnet` parameter of OVN-Kubernetes by default.
* `100.88.0.0/16`. This IP address range is used for the `internalTransSwitchSubnet` parameter of OVN-Kubernetes by default.
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit

Suggested change
* `100.64.0.0/16`. This IP address range is used for the `internalJoinSubnet` parameter of OVN-Kubernetes by default.
* `100.88.0.0/16`. This IP address range is used for the `internalTransSwitchSubnet` parameter of OVN-Kubernetes by default.
* `100.64.0.0/16`: This IP address range is used for the `internalJoinSubnet` parameter of OVN-Kubernetes by default.
* `100.88.0.0/16`: This IP address range is used for the `internalTransSwitchSubnet` parameter of OVN-Kubernetes by default.


[NOTE]
====
This is an optional procedure and must only be used if the migration was blocked after using the `oc patch Network.config.openshift.io cluster --type='merge' --patch '{"metadata":{"annotations":{"network.openshift.io/network-type-migration":""}},"spec":{"networkType":"OVNKubernetes"}}'` command "Initiating the limited live migration process".
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there maybe a missing "from" before the section title reference? Also suggest moving the long command to its own block.

Suggested change
This is an optional procedure and must only be used if the migration was blocked after using the `oc patch Network.config.openshift.io cluster --type='merge' --patch '{"metadata":{"annotations":{"network.openshift.io/network-type-migration":""}},"spec":{"networkType":"OVNKubernetes"}}'` command "Initiating the limited live migration process".
This is an optional procedure and must only be used if the migration was blocked after using the following command from "Initiating the limited live migration process":
[source,terminal]
----
$ oc patch Network.config.openshift.io cluster --type='merge' \
--patch '{"metadata":{"annotations":{"network.openshift.io/network-type-migration":""}},"spec":{"networkType":"OVNKubernetes"}}'`
----

.Procedure

. If the `100.64.0.0/16` IP address range is already in use, enter the following command to patch it to a different range. The following example uses `100.63.0.0/16`.
Copy link
Contributor

Choose a reason for hiding this comment

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

White space and colon:

Suggested change
. If the `100.64.0.0/16` IP address range is already in use, enter the following command to patch it to a different range. The following example uses `100.63.0.0/16`.
. If the `100.64.0.0/16` IP address range is already in use, enter the following command to patch it to a different range. The following example uses `100.63.0.0/16`.

$ oc patch network.operator.openshift.io cluster --type='merge' -p='{"spec":{"defaultNetwork":{"ovnKubernetesConfig":{"ipv4":{"internalJoinSubnet": "100.63.0.0/16"}}}}}'
----

. If the `100.88.0.0/16` IP address range is already in use, enter the following command to patch it to a different range. The following example uses `100.99.0.0/16`.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. If the `100.88.0.0/16` IP address range is already in use, enter the following command to patch it to a different range. The following example uses `100.99.0.0/16`.
. If the `100.88.0.0/16` IP address range is already in use, enter the following command to patch it to a different range. The following example uses `100.99.0.0/16`:

It is not possible to upgrade a cluster to {product-title} 4.17 if it is using the OpenShift SDN network plugin. You must migrate to the OVN-Kubernetes plugin before upgrading to {product-title} 4.17.
====

To learn more about OVN-Kubernetes, read xref:../../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes#about-ovn-kubernetes[About the OVN-Kubernetes network plugin].
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
To learn more about OVN-Kubernetes, read xref:../../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes#about-ovn-kubernetes[About the OVN-Kubernetes network plugin].
To learn more about OVN-Kubernetes, see xref:../../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes#about-ovn-kubernetes[About the OVN-Kubernetes network plugin].

@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 Oct 11, 2024
@stevsmit
Copy link
Member Author

@adellape I'll need to make these changes in 4.16 and CP back to 4.15 with a new PR

@stevsmit stevsmit merged commit f368616 into openshift:enterprise-4.15 Oct 14, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.15 peer-review-done Signifies that the peer review team has reviewed this PR size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants