(DOCSP-30071) Un-nests nested tabs so the content doesn't disappear. (#1349)

* (DOCSP-30071) Un-nests nested tabs so the content doesn't dissappear.

* Revises per copy review.

Author: erabil-mdb

source/includes/install/upgrade-k8s-operator.rst

@@ -32,65 +32,63 @@ Before you install the |k8s-op-short|, make sure you
 
 .. _install-k8s-operator:
 
-Procedure
----------
+Install with |K8s|
+------------------
 
 The installation procedure varies based on how you want to configure your
 environment:
 
 .. tabs::
 
-   .. tab:: Kubernetes
-      :tabid: vank8s
+   .. tab:: Online using kubectl
+      :tabid: kubectl
 
-      .. tabs::
+      .. include:: /includes/install/same-namespace-kubectl.rst
 
-         .. tab:: Online using kubectl
-            :tabid: kubectl
+      .. include:: /includes/steps/install-kubectl.rst
 
-            .. include:: /includes/install/same-namespace-kubectl.rst
+   .. tab:: Online using Helm
+      :tabid: helmonline
 
-            .. include:: /includes/steps/install-kubectl.rst
+      Use the :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`.
 
-         .. tab:: Online using Helm
-            :tabid: helmonline
+      .. include:: /includes/install/install-vanilla-k8s-online-helm.rst
 
-            Use the :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`.
+   .. tab:: Offline using Helm and Docker
+      :tabid: helmoffline
 
-            .. include:: /includes/install/install-vanilla-k8s-online-helm.rst
+      Use the :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`.
 
-         .. tab:: Offline using Helm and Docker
-            :tabid: helmoffline
+      .. include:: /includes/install/install-vanilla-k8s-offline-helm.rst
+  
+Install with OpenShift
+----------------------
 
-            Use the :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`.
-
-            .. include:: /includes/install/install-vanilla-k8s-offline-helm.rst
-
-   .. tab:: OpenShift
-      :tabid: openshift
+The installation procedure varies based on how you want to configure your
+environment:
 
-      .. tabs::
+.. tabs::
 
-         .. tab:: Online using oc
-            :tabid: os
+   .. tab:: Online using oc
+      :tabid: os
 
-            .. include:: /includes/install/same-namespace-oc.rst
+      .. include:: /includes/install/same-namespace-oc.rst
 
-            .. include:: /includes/steps/install-oc.rst
+      .. include:: /includes/steps/install-oc.rst
 
-         .. tab:: Online using Helm
-            :tabid: os-helm-online
+   .. tab:: Online using Helm
+      :tabid: os-helm-online
 
-            Use the :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`.
+      Use the :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`.
 
-            .. include:: /includes/install/install-os-online-helm.rst
+      .. include:: /includes/install/install-os-online-helm.rst
 
-         .. tab:: Offline using Helm and Docker
-            :tabid: os-helm-offline
+   .. tab:: Offline using Helm and Docker
+      :tabid: os-helm-offline
 
-            Use the :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`.
+      Use the :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`.
 
-            .. include:: /includes/install/install-os-offline-helm.rst
+      .. include:: /includes/install/install-os-offline-helm.rst
 
 Verify the Installation
 -----------------------

source/tutorial/install-k8s-operator.txt

@@ -8,7 +8,72 @@ Upgrade the |k8s-op|
 
 .. default-domain:: mongodb
 
+.. contents:: On this page
+   :local:
+   :backlinks: none
+   :depth: 1
+   :class: singlecol
+
 The following procedure outlines how to upgrade the |k8s-op-short|
 to its latest version. 
 
-.. include:: /includes/install/upgrade-k8s-operator.rst
+Upgrade using |k8s|
+-------------------
+
+The following steps depend on how your environment is configured:
+
+.. tabs::
+         
+   .. tab:: Online using kubectl
+      :tabid: kubectlup
+ 
+      .. _upgrade-k8s-operator-kubectl:
+
+      .. include:: /includes/steps/upgrade-kubectl.rst
+
+   .. tab:: Online using Helm
+      :tabid: helmonlinek8sup
+
+      .. _upgrade-k8s-operator-helm:
+
+      .. include:: /includes/steps/upgrade-k8s-online-helm.rst
+            
+   .. tab:: Offline using Helm and Docker
+      :tabid: helmofflinek8sup
+
+      To upgrade the |k8s-op-short| on a host not connected to the
+      Internet:
+
+      .. include:: /includes/steps/upgrade-k8s-offline-helm-host.rst
+
+Upgrade using OpenShift
+-----------------------
+
+The following steps depend on how your environment is configured:
+
+.. tabs:: 
+      
+   .. tab:: Online using oc
+      :tabid: ocup
+
+      .. _upgrade-k8s-operator-oc:
+
+      .. include:: /includes/steps/upgrade-oc.rst
+
+   .. tab:: Online using Helm
+      :tabid: helmonlineosup
+
+      .. _upgrade-operator-helm-oc:
+
+      .. include:: /includes/steps/upgrade-os-online-helm.rst
+            
+   .. tab:: Offline using Helm and Docker
+      :tabid: helmofflineosup
+
+      To upgrade the |k8s-op-short| on a host not connected to the
+      Internet: 
+
+      .. include:: /includes/steps/upgrade-os-offline-helm-host.rst
+
+.. include:: /includes/troubleshoot-k8s.rst
+