OCPBUGS-499969: Removed 4.10 and 4.11 references from MetalLB docs

Author: dfitzmau

modules/nw-metalLB-basic-upgrade-operator.adoc

@@ -3,61 +3,54 @@
 // * networking/metallb/metallb-upgrading-operator.adoc
 
 :_mod-docs-content-type: PROCEDURE
-
 [id="upgrading-metallb-operator_{context}"]
-= Upgrading the MetalLB Operator
+= Manually upgrading the MetalLB Operator
 
+To manually control upgrading the MetalLB Operator, you must edit the `Subscription` custom resource (CR) that subscribes the namespace to `metallb-system`. 
 
 .Prerequisites
 
+* You used OperatorHub to install to the MetalLB Operator.
 * Access the cluster as a user with the `cluster-admin` role.
 
 .Procedure
 
-. Verify that the `metallb-system` namespace still exists:
+. Get the name of the install plan from the subscription:
 +
 [source,terminal]
 ----
-$ oc get namespaces | grep metallb-system
-----
-+
-.Example output
-[source,terminal]
-----
-metallb-system                                     Active   31m
+$ oc -n metallb-system get subscription metallb-operator-sub -o yaml
 ----
 
-. Verify the `metallb` custom resource still exists:
+. Edit `Subscription` CR by setting the `installPlanApproval` parameter to `Manual`:
 +
-[source,terminal]
-----
-$ oc get metallb -n metallb-system
-----
-+
-.Example output
-[source,terminal]
-----
-NAME      AGE
-metallb   33m
-----
-
-. Follow the guidance in "Installing from OperatorHub using the CLI" to install the latest {product-version} version of the MetalLB Operator.
-+
-[NOTE]
-====
-When installing the latest {product-version} version of the MetalLB Operator, you must install the Operator to the same namespace it was previously installed to.
-====
-
-. Verify the upgraded version of the Operator is now the {product-version} version.
+[source,yaml]
+----
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: metallb-operator-sub
+  namespace: metallb-system
+# ...
+spec:
+   channel: stable
+   installPlanApproval: Manual
+   name: metallb-operator
+   source: redhat-operators
+   sourceNamespace: openshift-marketplace
+# ...
+----
+
+. Confirm the install plan is in the namespace:
 +
 [source,terminal]
 ----
-$ oc get csv -n metallb-system
+$ oc get installplan -n metallb-system
 ----
 +
 .Example output
 [source,terminal,subs="attributes+"]
 ----
-NAME                                   DISPLAY            VERSION               REPLACES   PHASE
-metallb-operator.{product-version}.0-202207051316   MetalLB Operator   {product-version}.0-202207051316              Succeeded
+NAME            CSV                                               APPROVAL    APPROVED
+install-wzg94   metallb-operator.{product-title}.0-202502250302   Manual      true
 ----

modules/olm-deleting-metallb-operators-from-a-cluster-using-cli.adoc

@@ -6,10 +6,10 @@
 [id="olm-updating-metallb-operatorgroup_{context}"]
 = Editing the MetalLB Operator Operator group
 
-When upgrading from any MetalLB Operator version up to and including 4.10 to 4.11 and later, remove `spec.targetNamespaces` from the Operator group custom resource (CR). You must remove the spec regardless of whether you used the web console or the CLI to delete the MetalLB Operator.
+When upgrading from any MetalLB Operator version, remove `spec.targetNamespaces` from the Operator group custom resource (CR). You must remove the spec regardless of whether you used the web console or the CLI to delete the MetalLB Operator.
 [NOTE]
 ====
-The MetalLB Operator version 4.11 or later only supports the `AllNamespaces` install mode, whereas 4.10 or earlier versions support `OwnNamespace` or `SingleNamespace` modes.
+The MetalLB Operator only supports the `AllNamespaces` install mode.
 ====
 
 .Prerequisites

modules/olm-deleting-metallb-operators-from-a-cluster-using-web-console.adoc

@@ -6,29 +6,11 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-If you are currently running version 4.10 or an earlier version of the MetalLB Operator, please note that automatic updates to any version later than 4.10 do not work. Upgrading to a newer version from any version of the MetalLB Operator that is 4.11 or later is successful. For example, upgrading from version 4.12 to version 4.13 will occur smoothly.
+// Is the relationship with OCP updates correct? What about z-streams?
+A `Subscription` custom resource (CR) that subscribes the namespace to `metallb-system` by default sets the `installPlanApproval` parameter to `Automatic`. This means that when you update to the latest version of {product-title}, the MetalLB Operator is automatically upgraded to the latst version of the Operator.
 
-A summary of the upgrade procedure for the MetalLB Operator from 4.10 and earlier is as follows:
-
-. Delete the installed MetalLB Operator version for example 4.10. Ensure that the namespace and the `metallb` custom resource are not removed.
-
-. Using the CLI, install the MetalLB Operator {product-version} in the same namespace where the previous version of the MetalLB Operator was installed.
-
-[NOTE]
-====
-This procedure does not apply to automatic z-stream updates of the MetalLB Operator, which follow the standard straightforward method.
-====
-
-For detailed steps to upgrade the MetalLB Operator from 4.10 and earlier, see the guidance that follows. As a cluster administrator, start the upgrade process by deleting the MetalLB Operator by using the OpenShift CLI (`oc`) or the web console.
-
-//Delete metallb using web console
-include::modules/olm-deleting-metallb-operators-from-a-cluster-using-web-console.adoc[leveloffset=+1]
-
-//Delete metallb using cli
-include::modules/olm-deleting-metallb-operators-from-a-cluster-using-cli.adoc[leveloffset=+1]
-
-//Delete targetNamespace
-include::modules/olm-updating-metallb-operatorgroup.adoc[leveloffset=+1]
+// Any consequences to doing this?
+If you need to manual control upgrading the MetalLB Operator, set the `installPlanApproval` parameter to `Manual`. 
 
 //Upgrade the MetalLB
 include::modules/nw-metalLB-basic-upgrade-operator.adoc[leveloffset=+1]
@@ -39,4 +21,3 @@ include::modules/nw-metalLB-basic-upgrade-operator.adoc[leveloffset=+1]
 * xref:../../../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[Deleting Operators from a cluster]
 
 * xref:../../../networking/networking_operators/metallb-operator/metallb-operator-install.adoc#metallb-operator-install[Installing the MetalLB Operator]
-

modules/olm-updating-metallb-operatorgroup.adoc

@@ -38,6 +38,7 @@ include::modules/olm-installing-operators-from-operatorhub.adoc[leveloffset=+1]
 
 * xref:../../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding OperatorHub]
 
+// Installing from OperatorHub by using the CLI
 include::modules/olm-installing-from-operatorhub-using-web-console.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
@@ -46,6 +47,8 @@ include::modules/olm-installing-from-operatorhub-using-web-console.adoc[leveloff
 * xref:../../operators/admin/olm-upgrading-operators.adoc#olm-approving-pending-upgrade_olm-upgrading-operators[Manually approving a pending Operator update]
 
 ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
+
+// Installing from OperatorHub by using the CLI
 include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
@@ -58,7 +61,7 @@ include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+1]
 include::modules/olm-preparing-multitenant-operators.adoc[leveloffset=+1]
 .Next steps
 
-* Install the Operator in the tenant Operator namespace. This task is more easily performed by using the OperatorHub in the web console instead of the CLI; for a detailed procedure, see xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console].
+* Install the Operator in the tenant Operator namespace. This task is more easily performed by using the OperatorHub in the web console instead of the CLI; for a detailed procedure, "Installing from OperatorHub using the web console".
 +
 [NOTE]
 ====
@@ -71,9 +74,10 @@ After completing the Operator installation, the Operator resides in the tenant O
 * xref:../../operators/understanding/olm-multitenancy.adoc#olm-multitenancy[Operators in multitenant clusters]
 
 include::modules/olm-installing-global-namespaces.adoc[leveloffset=+1]
+
 .Next steps
 
-* Install the desired Operator in your custom global namespace. Because the web console does not populate the *Installed Namespace* menu during Operator installation with custom global namespaces, this task can only be performed with the OpenShift CLI (`oc`). For a detailed procedure, see xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operator-from-operatorhub-using-cli_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the CLI].
+* Install the desired Operator in your custom global namespace. Because the web console does not populate the *Installed Namespace* menu during Operator installation with custom global namespaces, this task can only be performed with the OpenShift CLI (`oc`). For a detailed procedure, see "Installing from OperatorHub using the CLI".
 +
 [NOTE]
 ====