(DOCSP-9020): Updated docker import to docker load on install

Author: Anthony Sansone

source/includes/steps-helm-master.yaml

@@ -1,6 +1,6 @@
 ---
 title: "Change to the directory in which you cloned the repository."
-level: 4 
+level: 4
 ref: helm-master-cd
 ---
 title: "{{method}}"
@@ -10,20 +10,20 @@ replacement:
   k8sonline: |
 
     .. code-block:: sh
-        
+
         helm_chart > operator.yaml \
         -- values helm_chart/values.yaml
         kubectl apply -f operator.yaml
-      
+
     .. include:: /includes/install/helm-install-k8s-options.rst
 
-    .. note:: 
-    
-        You can also pass these values as options when you apply the 
+    .. note::
+
+        You can also pass these values as options when you apply the
         Helm Chart:
-    
+
         .. code-block:: sh
-      
+
           helm template --set namespace=<testNamespace> \
           helm_chart > operator.yaml \
           -- values helm_chart/values.yaml
@@ -32,75 +32,75 @@ replacement:
   k8soffline: |
 
     .. code-block:: sh
-      
+
        helm template --set registry.pullPolicy=IfNotPresent \
        helm_chart > operator.yaml \
        -- values helm_chart/values.yaml
        kubectl apply -f operator.yaml
-  
+
     .. include:: /includes/install/helm-install-k8s-options.rst
-    
-    .. note:: 
-    
+
+    .. note::
+
        You can also pass these values as options when you apply the Helm
        Chart:
-    
+
        .. code-block:: sh
-                
+
           helm template --set registry.pullPolicy=IfNotPresent \
           --set namespace=<testNamespace> \
           helm_chart > operator.yaml \
           -- values helm_chart/values.yaml
-          kubectl apply -f operator.yaml  
-  
+          kubectl apply -f operator.yaml
+
   osonline: |
 
     .. code-block:: sh
-      
+
        helm_chart > operator.yaml \
        -- values helm_chart/values-openshift.yaml
        oc apply -f operator.yaml
-  
+
     .. include:: /includes/install/helm-install-os-options.rst
-    
-    .. note:: 
-    
+
+    .. note::
+
        You can also pass these values as options when you apply the Helm
        Chart:
-    
+
        .. code-block:: sh
-                
+
           helm template --set registry.imagePullSecrets=<openshift-pull-secret> \
           helm_chart > operator.yaml \
           -- values helm_chart/values-openshift.yaml
-          oc apply -f operator.yaml   
-  
+          oc apply -f operator.yaml
+
   osoffline: |
 
     .. code-block:: sh
-      
+
        helm template --set registry.pullPolicy=IfNotPresent \
        --set registry.imagePullSecrets=<openshift-pull-secret> \
        helm_chart > operator.yaml \
        -- values helm_chart/values-openshift.yaml
        oc apply -f operator.yaml
-  
+
     .. include:: /includes/install/helm-install-os-options.rst
-    
-    .. note:: 
-    
+
+    .. note::
+
        You can also pass these values as options when you apply the Helm
        Chart:
-    
+
        .. code-block:: sh
-                
+
           helm template --set registry.pullPolicy=IfNotPresent \
           --set registry.imagePullSecrets=<openshift-pull-secret> \
           --set namespace=<testNamespace> \
           helm_chart > operator.yaml \
           -- values helm_chart/values-openshift.yaml
-          oc apply -f operator.yaml  
-  
+          oc apply -f operator.yaml
+
 ---
 title: "Connect to the internet."
 level: 4
@@ -110,16 +110,16 @@ title: "Disconnect from the internet."
 level: 4
 ref: helm-master-disconnect-internet
 ---
-title: "Add the name of your ``<openshift-pull-secret>`` to the 
-   ``registry.imagePullSecrets`` setting in the 
+title: "Add the name of your ``<openshift-pull-secret>`` to the
+   ``registry.imagePullSecrets`` setting in the
    ``helm_chart/values-openshift.yaml`` file:"
 level: 4
 ref: helm-master-openshift-pull-secret
 content: |
 
    .. code-block:: sh
       :emphasize-lines: 3
-      
+
       registry:
       # The pull secret must be specified
         imagePullSecrets: <openshift-pull-secret>
@@ -163,17 +163,17 @@ replacement:
 
     .. code-block:: sh
 
-       docker import mongodb-enterprise-operator.tar quay.io/mongodb/mongodb-enterprise-operator:<op-version>; \
-       docker import mongodb-enterprise-database.tar quay.io/mongodb/mongodb-enterprise-database:<op-version>; \
-       docker import mongodb-enterprise-ops-manager.tar quay.io/mongodb/mongodb-enterprise-ops-manager:<om-version>-operator<op-version>
-  
+       docker load -i mongodb-enterprise-operator.tar; \
+       docker load -i mongodb-enterprise-database.tar; \
+       docker load -i mongodb-enterprise-ops-manager.tar
+
   rhimport: |
-    
+
     .. code-block:: sh
 
-       docker import mongodb-enterprise-operator.tar registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:<op-version>; \
-       docker import mongodb-enterprise-database.tar registry.connect.redhat.com/mongodb/mongodb-enterprise-database:<op-version>; \
-       docker import mongodb-enterprise-ops-manager.tar registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager:<om-version>-operator<op-version>
+       docker load -i mongodb-enterprise-operator.tar; \
+       docker load -i mongodb-enterprise-database.tar; \
+       docker load -i mongodb-enterprise-ops-manager.tar
 
 ---
 title: "Use ``docker`` to request the files."
@@ -198,7 +198,7 @@ replacement:
 
   versions: |
 
-    .. include:: /includes/install/replace-op-and-om-versions.rst 
+    .. include:: /includes/install/replace-op-and-om-versions.rst
 ...
 
 

source/tutorial/install-k8s-operator.txt

@@ -14,7 +14,7 @@ Install the |k8s-op-full|
    :depth: 1
    :class: singlecol
 
-.. include:: /includes/styles/corrections.rst      
+.. include:: /includes/styles/corrections.rst
 
 Use the |k8s-op-full| to deploy:
 
@@ -136,21 +136,21 @@ Install the |k8s-op-full|
                   - id: os
                     name: Online using oc
                     content: |
-                      
+
                       .. include:: /includes/install/same-namespace-oc.rst
 
                       .. include:: /includes/steps/install-oc.rst
 
                   - id: os-helm-online
                     name: Online using Helm
                     content: |
-                      
+
                       .. include:: /includes/install/install-os-online-helm.rst
 
                   - id: os-helm-offline
                     name: Offline using Helm and Docker
                     content: |
-                      
+
                       .. include:: /includes/install/install-os-offline-helm.rst
 
 .. include:: /includes/troubleshoot-k8s.rst