diff --git a/installing/installing_aws/installing-aws-network-customizations.adoc b/installing/installing_aws/installing-aws-network-customizations.adoc index 54ef43d94d..6bea593758 100644 --- a/installing/installing_aws/installing-aws-network-customizations.adoc +++ b/installing/installing_aws/installing-aws-network-customizations.adoc @@ -54,8 +54,6 @@ include::modules/installation-initializing.adoc[leveloffset=+1] include::modules/installation-configuration-parameters.adoc[leveloffset=+2] -include::modules/nw-ovn-technology-preview.adoc[leveloffset=+2] - include::modules/nw-install-config-parameters.adoc[leveloffset=+2] include::modules/installation-aws-config-yaml.adoc[leveloffset=+2] diff --git a/installing/installing_azure/installing-azure-network-customizations.adoc b/installing/installing_azure/installing-azure-network-customizations.adoc index 301eafbc82..6ef84110b2 100644 --- a/installing/installing_azure/installing-azure-network-customizations.adoc +++ b/installing/installing_azure/installing-azure-network-customizations.adoc @@ -39,8 +39,6 @@ include::modules/installation-initializing.adoc[leveloffset=+1] include::modules/installation-configuration-parameters.adoc[leveloffset=+2] -include::modules/nw-ovn-technology-preview.adoc[leveloffset=+2] - include::modules/nw-install-config-parameters.adoc[leveloffset=+2] include::modules/installation-azure-config-yaml.adoc[leveloffset=+2] diff --git a/installing/installing_gcp/installing-gcp-network-customizations.adoc b/installing/installing_gcp/installing-gcp-network-customizations.adoc index 1f022675de..e51799197f 100644 --- a/installing/installing_gcp/installing-gcp-network-customizations.adoc +++ b/installing/installing_gcp/installing-gcp-network-customizations.adoc @@ -42,8 +42,6 @@ include::modules/installation-initializing.adoc[leveloffset=+1] include::modules/installation-configuration-parameters.adoc[leveloffset=+2] -include::modules/nw-ovn-technology-preview.adoc[leveloffset=+2] - include::modules/nw-install-config-parameters.adoc[leveloffset=+2] include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2] diff --git a/modules/nw-install-config-parameters.adoc b/modules/nw-install-config-parameters.adoc index b879cceecd..cf2a8473d6 100644 --- a/modules/nw-install-config-parameters.adoc +++ b/modules/nw-install-config-parameters.adoc @@ -7,16 +7,6 @@ // * installing/installing_vsphere/installing-vsphere-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc -ifeval::["{context}" == "installing-aws-network-customizations"] -:ovn-preview: -endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:ovn-preview: -endif::[] -ifeval::["{context}" == "installing-gcp-network-customizations"] -:ovn-preview: -endif::[] - [id="network-customization-config-yaml_{context}"] = Network configuration parameters @@ -30,33 +20,18 @@ You cannot modify these parameters in the `install-config.yaml` file after insta ==== .Required network parameters -[cols=".^2,.^5,.^3a",options="header"] +[cols=".^2,.^5,.^3",options="header"] |==== |Parameter|Description|Value -ifdef::ovn-preview[] -ifdef::openshift-origin[] |`networking.networkType` |The default Container Network Interface (CNI) network provider plug-in to deploy. +ifdef::openshift-origin[] |Either `OpenShiftSDN` or `OVNKubernetes`. The default value is `OVNKubernetes`. endif::openshift-origin[] - ifndef::openshift-origin[] -|`networking.networkType` -|The default Container Network Interface (CNI) network provider plug-in to deploy. The `OpenShiftSDN` plug-in is the -only plug-in supported in {product-title} {product-version}. The `OVNKubernetes` -plug-in is available as a Technology Preview in {product-title} -{product-version}. |Either `OpenShiftSDN` or `OVNKubernetes`. The default value is `OpenShiftSDN`. endif::openshift-origin[] -endif::ovn-preview[] - -ifndef::ovn-preview[] -|`networking.networkType` -|The default Container Network Interface (CNI) network provider plug-in to deploy. The `OpenShiftSDN` plug-in is the -only plug-in supported in {product-title} {product-version}. -|The default value is `OpenShiftSDN`. -endif::[] |`networking.clusterNetwork[].cidr` |A block of IP addresses from which Pod IP addresses are allocated. The @@ -84,13 +59,3 @@ overlap with any other network block. Multiple CIDR ranges may be specified. |An IP address allocation in CIDR format. The default value is `10.0.0.0/16`. |==== - -ifeval::["{context}" == "installing-aws-network-customizations"] -:!ovn-preview: -endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:!ovn-preview: -endif::[] -ifeval::["{context}" == "installing-gcp-network-customizations"] -:!ovn-preview: -endif::[] diff --git a/modules/nw-operator-cr.adoc b/modules/nw-operator-cr.adoc index d0c91e8a34..a2a7f9b4e6 100644 --- a/modules/nw-operator-cr.adoc +++ b/modules/nw-operator-cr.adoc @@ -11,19 +11,6 @@ // Installation assemblies need different details than the CNO operator does ifeval::["{context}" == "cluster-network-operator"] :operator: -:ovn-preview: -endif::[] -// Remove for OCP 4.5 -ifeval::["{context}" == "installing-aws-network-customizations"] -:ovn-preview: -endif::[] -// Remove for OCP 4.5 -ifeval::["{context}" == "installing-azure-network-customizations"] -:ovn-preview: -endif::[] -// Remove for OCP 4.5 -ifeval::["{context}" == "installing-gcp-network-customizations"] -:ovn-preview: endif::[] [id="nw-operator-cr_{context}"] @@ -170,7 +157,6 @@ value is normally configured automatically. <5> The port to use for all VXLAN packets. The default value is `4789`. endif::operator[] -ifdef::ovn-preview[] [id="nw-operator-configuration-parameters-for-ovn-sdn_{context}"] == Configuration parameters for the OVN-Kubernetes default CNI network provider @@ -218,8 +204,6 @@ endif::operator[] <4> The UDP port for the Geneve overlay network. -endif::ovn-preview[] - [id="nw-operator-example-cr_{context}"] == Cluster Network Operator example configuration @@ -253,18 +237,4 @@ spec: ifeval::["{context}" == "cluster-network-operator"] :!operator: -:!ovn-preview: -endif::[] - -// Remove for OCP 4.5 -ifeval::["{context}" == "installing-aws-network-customizations"] -:!ovn-preview: -endif::[] -// Remove for OCP 4.5 -ifeval::["{context}" == "installing-azure-network-customizations"] -:!ovn-preview: -endif::[] -// Remove for OCP 4.5 -ifeval::["{context}" == "installing-gcp-network-customizations"] -:!ovn-preview: endif::[] diff --git a/modules/nw-ovn-kubernetes-matrix.adoc b/modules/nw-ovn-kubernetes-matrix.adoc index 4d3071fdd8..4fd12d1517 100644 --- a/modules/nw-ovn-kubernetes-matrix.adoc +++ b/modules/nw-ovn-kubernetes-matrix.adoc @@ -11,37 +11,35 @@ [cols="50%,25%,25%",options="header"] |=== ifeval::["{context}" == "about-ovn-kubernetes"] -|Feature|OVN-Kubernetes ^[1]^|OpenShift SDN +|Feature|OVN-Kubernetes|OpenShift SDN -|Egress IPs|Not supported|Supported +|Egress IPs|Supported|Supported -|Egress firewall ^[2]^|Not supported|Supported +|Egress firewall ^[1]^|Supported|Supported |Egress router|Not supported|Supported -|Kubernetes network policy|Supported|Partially supported ^[3]^ +|Kubernetes network policy|Supported|Partially supported ^[2]^ |Multicast|Supported|Supported endif::[] ifeval::["{context}" == "about-openshift-sdn"] -|Feature|OpenShift SDN|OVN-Kubernetes ^[1]^ +|Feature|OpenShift SDN|OVN-Kubernetes -|Egress IPs|Supported|Not supported +|Egress IPs|Supported|Supported -|Egress firewall ^[2]^|Supported|Not supported +|Egress firewall ^[1]^|Supported|Supported |Egress router|Supported|Not supported -|Kubernetes network policy|Partially supported ^[3]^|Supported +|Kubernetes network policy|Partially supported ^[2]^|Supported |Multicast|Supported|Supported endif::[] |=== [.small] -- -1. Available only as a Technology Preview feature in {product-title} {product-version}. +1. Egress firewall is also known as egress network policy in OpenShift SDN. This is not the same as network policy egress. -2. Egress firewall is also known as egress network policy in OpenShift SDN. This is not the same as network policy egress. - -3. Does not support egress rules and some `ipBlock` rules. +2. Does not support egress rules and some `ipBlock` rules. -- diff --git a/modules/nw-ovn-technology-preview.adoc b/modules/nw-ovn-technology-preview.adoc deleted file mode 100644 index 0763fc5881..0000000000 --- a/modules/nw-ovn-technology-preview.adoc +++ /dev/null @@ -1,12 +0,0 @@ -[IMPORTANT] -==== -The Open Virtual Networking (OVN) Kubernetes network plug-in is a Technology -Preview feature only. Technology Preview features are not supported with Red Hat -production service level agreements (SLAs) and might not be functionally -complete. Red Hat does not recommend using them in production. These features -provide early access to upcoming product features, enabling customers to test -functionality and provide feedback during the development process. - -For more information about the support scope of the OVN Technology Preview, see -https://access.redhat.com/articles/4380121. -==== diff --git a/networking/cluster-network-operator.adoc b/networking/cluster-network-operator.adoc index 22a0aa7947..0fedd6cc05 100644 --- a/networking/cluster-network-operator.adoc +++ b/networking/cluster-network-operator.adoc @@ -15,6 +15,4 @@ include::modules/nw-cno-status.adoc[leveloffset=+1] include::modules/nw-cno-logs.adoc[leveloffset=+1] -include::modules/nw-ovn-technology-preview.adoc[leveloffset=+1] - include::modules/nw-operator-cr.adoc[leveloffset=+1] diff --git a/networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc b/networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc index e15a678006..add66bc995 100644 --- a/networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc +++ b/networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc @@ -5,16 +5,17 @@ include::modules/common-attributes.adoc[] toc::[] -include::modules/nw-ovn-technology-preview.adoc[leveloffset=+1] - The {product-title} cluster uses a virtualized network for Pod and Service networks. The OVN-Kubernetes Container Network Interface (CNI) plug-in is a network provider for the default cluster network. include::modules/nw-ovn-kubernetes-features.adoc[leveloffset=+1] include::modules/nw-ovn-kubernetes-matrix.adoc[leveloffset=+1] -include::modules/nw-ovn-kubernetes-metrics.adoc[leveloffset=+1] +// This is a moving target; what is included isn't valid for 4.6 +//include::modules/nw-ovn-kubernetes-metrics.adoc[leveloffset=+1] .Additional resources +* xref:../../networking/ovn_kubernetes_network_provider/configuring-egress-firewall-ovn.adoc#configuring-egress-firewall-ovn[Configuring an egress firewall for a project] +* xref:../../networking/network_policy/about-network-policy.adoc#about-network-policy[About network policy] * xref:../../networking/ovn_kubernetes_network_provider/enabling-multicast.adoc#nw-ovn-kubernetes-enabling-multicast[Enabling multicast for a project] -* xref:../../networking/ovn_kubernetes_network_provider/disabling-multicast.adoc#nw-ovn-kubernetes-disabling-multicast[Disabling multicast for a project] +* xref:../../rest_api/operator_apis/network-operator-openshift-io-v1.adoc#network-operator-openshift-io-v1[Network [operator.openshift.io/v1]] diff --git a/networking/ovn_kubernetes_network_provider/disabling-multicast.adoc b/networking/ovn_kubernetes_network_provider/disabling-multicast.adoc index 6ae97ac038..dbb70680f6 100644 --- a/networking/ovn_kubernetes_network_provider/disabling-multicast.adoc +++ b/networking/ovn_kubernetes_network_provider/disabling-multicast.adoc @@ -5,7 +5,5 @@ include::modules/common-attributes.adoc[] toc::[] -include::modules/nw-ovn-technology-preview.adoc[leveloffset=+1] - include::modules/nw-disabling-multicast.adoc[leveloffset=+1] diff --git a/networking/ovn_kubernetes_network_provider/enabling-multicast.adoc b/networking/ovn_kubernetes_network_provider/enabling-multicast.adoc index b82eb956d9..adb1bf8e25 100644 --- a/networking/ovn_kubernetes_network_provider/enabling-multicast.adoc +++ b/networking/ovn_kubernetes_network_provider/enabling-multicast.adoc @@ -13,15 +13,12 @@ ifeval::["{product-version}" == "4.5"] :bz: endif::[] - toc::[] -include::modules/nw-ovn-technology-preview.adoc[leveloffset=+1] - ifdef::bz[] [NOTE] ==== -In {product-title} {product-version}, a bug prevents Pods in the same namespace, but assigned to different nodes, from communicating over multicast. For more information, see link:https://bugzilla.redhat.com/show_bug.cgi?id=1843695[BZ#1843695]. +In {product-title} {product-version}, a bug prevents pods in the same namespace, but assigned to different nodes, from communicating over multicast. For more information, see link:https://bugzilla.redhat.com/show_bug.cgi?id=1843695[BZ#1843695]. ==== endif::bz[] diff --git a/networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc b/networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc index 74840b7085..dbf32d7072 100644 --- a/networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc +++ b/networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc @@ -7,8 +7,6 @@ toc::[] As a cluster administrator, you can migrate to the OVN-Kubernetes default Container Network Interface (CNI) network provider from the OpenShift SDN default CNI network provider. -include::modules/nw-ovn-technology-preview.adoc[leveloffset=+1] - To learn more about OVN-Kubernetes, read xref:../../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes#about-ovn-kubernetes[About the OVN-Kubernetes network provider]. include::modules/nw-ovn-kubernetes-migration.adoc[leveloffset=+1]