Merge pull request #61255 from ShaunaDiaz/OSDOCS-6510

OSDOCS-6510: remove dual stack and secondary gateway interface

Author: sjhala-ccs

modules/microshift-man-config-ovs-bridge.adoc renamed to _unused_topics/microshift-man-config-ovs-bridge.adoc

@@ -0,0 +1,45 @@
+// Module included in the following assemblies:
+//
+// * module may be unused in 4.13
+
+:_content-type: PROCEDURE
+[id="microshift-nodeport-unreachable-workaround_{context}"]
+= Manually restarting the `ovnkube-master` pod to resume node port traffic
+
+After you install {product-title}, NodePort service traffic might stop. To troubleshoot this issue, manually restart the `ovnkube-master` pod in the `openshift-ovn-kubernetes` namespace.
+
+.Prerequisites
+
+* The OpenShift CLI (`oc`) is installed.
+* A cluster installed on infrastructure configured with the Open Virtual Network (OVN)-Kubernetes network plugin.
+* Access to the `kubeconfig` file.
+* The KUBECONFIG environment variable is set.
+
+.Procedure
+
+Run the commands listed in each step that follows to restore the `NodePort` service traffic after you install{product-title}:
+
+. Find the name of the ovn-master pod that you want to restart by running the following command:
++
+[source, terminal]
+----
+$ pod=$(oc get pods -n openshift-ovn-kubernetes | grep ovnkube-master | awk -F " " '{print $1}')
+----
+
+. Force a restart of the of the ovnkube-master pod by running the following command:
++
+[source, terminal]
+----
+$ oc -n openshift-ovn-kubernetes delete pod $pod
+----
+
+. Optional: To confirm that the ovnkube-master pod restarted, run the following command:
++
+[source, terminal]
+----
+$ oc get pods -n openshift-ovn-kubernetes
+----
+If the pod restarted, the listing of the running pods shows a different ovnkube-master pod name and age consistent with the procedure you just completed.
+
+. Verify that the `NodePort` service can now be reached.
+

_unused_topics/microshift-nodeport-unreachable-workaround.adoc

@@ -27,8 +27,6 @@ include::modules/microshift-configuring-ovn.adoc[leveloffset=+1]
 
 include::modules/microshift-restart-ovnkube-master.adoc[leveloffset=+1]
 
-//include::modules/microshift-man-config-ovs-bridge.adoc[leveloffset=+1]
-
 include::modules/microshift-http-proxy.adoc[leveloffset=+1]
 
 include::modules/microshift-rpm-ostree-https.adoc[leveloffset=+1]
@@ -47,4 +45,4 @@ include::modules/microshift-mDNS.adoc[leveloffset=+1]
 [id="additional-resources_microshift-understanding-networking-settings"]
 .Additional resources
 
-* xref:../microshift_release_notes/microshift-4-13-release-notes.adoc#microshift-4-13-known-issues[{product-title} {product-version} release notes --> Known issues]
+* xref:../microshift_release_notes/microshift-4-13-release-notes.adoc#microshift-4-13-known-issues[{product-title} {product-version} release notes --> Known issues]

microshift_networking/microshift-networking.adoc

@@ -69,8 +69,6 @@ Networking features available with {product-title} {product-version} include:
 * Kubernetes network policy
 * Dynamic node IP
 * Cluster network on specified host interface
-* Secondary gateway interface
-* Dual stack
 
 Networking features not available with {product-title} {product-version}:
 
@@ -118,21 +116,3 @@ Bridge mappings allow provider network traffic to reach the physical network. Tr
 [id="microshift-primary-gateway-interface_{context}"]
 === Primary gateway interface
 You can specify the desired host interface name in the `ovn.yaml` config file as `gatewayInterface`. The specified interface is added in OVS bridge br-ex which acts as gateway bridge for the CNI network.
-
-[id="microshift-secondary-gateway-interface_{context}"]
-=== Secondary gateway interface
-You can set up one additional host interface for cluster ingress and egress in the `ovn.yaml` config file. The additional interface is added in a second OVS bridge `br-ex1`. Cluster pod traffic directed to the additional host subnet is routed automatically based on the destination IP through br-ex1.
-
-Either two or three OVS bridges are created based on the CNI configuration:
-
-Default deployment::
-* The `externalGatewayInterface` is not specified in the `ovn.yaml` config file.
-* Two OVS bridges, `br-ex` and `br-int`, are created.
-
-Customized deployment::
-* The `externalGatewayInterface` is user-specified in the `ovn.yaml` config file.
-* Three OVS bridges are created: `br-ex`, `br-ex1` and `br-int`.
-
-The br-ex bridge is created by `microshift-ovs-init.service` or manually. The br-ex bridge contains statically programmed openflow rules which distinguish traffic to and from the host network (underlay) and the OVN network (overlay).
-
-The `br-int` bridge is created by the `ovnkube-master` container. The `br-int` bridge contains dynamically programmed openflow rules which handle cluster network traffic.

modules/microshift-cni.adoc

@@ -31,11 +31,9 @@ $ cat /etc/microshift/ovn.yaml.default
 ovsInit:
   disableOVSInit: false
   gatewayInterface: "" <1>
-  externalGatewayInterface: "" <2>
 mtu: 1400
 ----
 <1> The default value is an empty string that means "not-specified." The CNI network plugin auto-detects to interface with the default route.
-<2> The default value is an empty string that means "disabled."
 
 . To customize your configuration, use the following table that lists the valid values you can use:
 +
@@ -61,12 +59,6 @@ mtu: 1400
 |Ingress that is the API gateway
 |eth0
 
-|`ovsInit.externalGatewayInterface`
-|Alpha
-|eth1
-|Ingress routing external traffic to your services and pods inside the node
-|eth1
-
 |mtu
 |uint32
 |auto
@@ -91,7 +83,6 @@ If you change the `mtu` configuration value in the `ovn.yaml` file, you must res
 ovsInit:
   disableOVSInit: true
   gatewayInterface: eth0
-  externalGatewayInterface: eth1
 mtu: 1300
 ----