Merge pull request #22877 from apinnick/virt-registry-update

Virt registry update

Author: bergerhoffer

modules/virt-creating-vddk-image.adoc

@@ -5,23 +5,19 @@
 [id="virt-creating-vddk-image_{context}"]
 = Creating a VDDK image
 
-The VMware Virtual Disk Development Kit (VDDK) SDK is used to copy VMware virtual disks.
-
-You can download VDDK, convert it into an image, push the image to a private container repository, and add it to the `v2v-vmware` ConfigMap.
+You can convert the VMware Virtual Disk Development Kit (VDDK) into an image, and push the image to an image registry. Then, add the image to the `v2v-vmware` ConfigMap.
 
 .Prerequisites
 
-* You must have a VMware account to download VDDK.
-* You must be logged in to your private container repository.
-+
-Storing the VDDK image in a public repository may violate the terms of the VMware license.
+* You must configure an image registry.
+* You must download the VDDK archive file.
 
 .Procedure
 
-. Create a temporary directory for VDDK:
+. Create and navigate to a temporary directory:
 +
 ----
-$ mkdir /tmp/my_vddk && cd /tmp/my_vddk
+$ mkdir /tmp/<dir_name> && cd /tmp/<dir_name>
 ----
 
 . In a browser, navigate to link:https://www.vmware.com/support/pubs/[VMware Documentation].
@@ -33,7 +29,8 @@ $ mkdir /tmp/my_vddk && cd /tmp/my_vddk
 $ tar -xzf VMware-vix-disklib-<version>.x86_64.tar.gz
 ----
 
-. Create a *Dockerfile*:
+. Extract the VDDK archive file to your temporary directory.
+. Create a `Dockerfile`:
 +
 ----
 $ cat > Dockerfile <<EOF
@@ -47,16 +44,18 @@ EOF
 . Build the image:
 +
 ----
-$ docker build -f Dockerfile -t <server/username/reponame:tag> <1>
+$ podman build . -t <server_name>/path/to/vddk:<tag> <1>
 ----
-<1> Specify your repository details.
+<1> Specify the image registry, path, and tag:
++
+* For an external registry, specify the server name, for example, `server.example.com:5000/vddk:<tag>`.
+* For the internal registry, use the internal registry route, for example, `image-registry.openshift-image-registry.svc:5000/openshift/vddk:<tag>`.
 
-. Push the image to your repository:
+. Push the image to the registry:
 +
 ----
-$ docker push <server/username/reponame:tag> <1>
+$ podman push <server_name>/path/to/vddk:<tag>
 ----
-<1> Specify your repository details.
 
 . Ensure that the image is accessible to your {VirtProductName} environment.
 . Edit the `v2v-vmware` ConfigMap in the *openshift-cnv* project:
@@ -71,6 +70,5 @@ $ oc edit configmap v2v-vmware -n openshift-cnv
 ----
 ...
 data:
-  vddk-init-image: <server/username/reponame:tag> <1>
+  vddk-init-image: <server_name>/path/to/vddk:<tag>
 ----
-<1> Specify your repository details.

modules/virt-downloading-vddk.adoc

@@ -0,0 +1,14 @@
+// Module included in the following assemblies:
+//
+// * virt/virtual_machines/importing_vms/virt-importing-vmware-vm.adoc
+[id='virt-downloading-vddk_{context}']
+= Downloading the VMware Virtual Disk Development Kit
+
+You can download the VMware Virtual Disk Development Kit (VDDK) to import VMware virtual disks.
+
+.Procedure
+
+. In a browser, navigate to link:https://code.vmware.com/sdks[VMware code SDKs].
+. Click *Virtual Disk Development Kit (VDDK)*.
+. Select the VDDK release for your VMware version.
+. Click *Download*, log in with your VMware account credentials, and save the VDDK archive file.

virt/virtual_machines/importing_vms/virt-importing-vmware-vm.adoc

@@ -12,8 +12,42 @@ If you import a VMware template, the wizard creates a virtual machine based on t
 include::modules/technology-preview.adoc[leveloffset=+1]
 :!FeatureName:
 
+== Creating and using a VMware Virtual Disk Development Kit image
+
+The VMware Virtual Disk Development Kit (VDDK) SDK is used to copy VMware virtual disks. You can create a VDDK image and add it to the the `v2v-vmware` ConfigMap to import a VMware virtual machine.
+
+You can store the VDDK image in the internal {product-title} image registry or in a secure external image registry.
+
+[NOTE]
+====
+Storing the VDDK image in a public registry might violate the terms of the VMware license.
+====
+
 .Prerequisites
 
+* You must configure an image registry.
+
+=== Accessing the internal image registry
+
+You can access an {product-title} registry directly, from within the cluster, or externally, by exposing the registry with a route.
+
+Internal access::
+You can access the internal image registry xref:../../../registry/accessing-the-registry.adoc#registry-accessing-directly_accessing-the-registry[directly, from your cluster].
+
+External access::
+You can access the internal image registry externally, xref:../../../registry/securing-exposing-registry.adoc#registry-exposing-secure-registry-manually_securing-exposing-registry[by exposing the image registry with a route].
+
+=== Accessing an external image registry
+
+You can access an external image registry from an {product-title} cluster.
+
+.Procedure
+
+. xref:../../../builds/setting-up-trusted-ca.adoc#configmap-adding-ca_setting-up-trusted-ca[Add certificate authorities] for the external image registry to the {product-title} cluster.
+
+. Optionally, you can create a xref:../../../openshift_images/managing_images/using-image-pull-secrets.adoc#images-allow-pods-to-reference-images-from-secure-registries_using-image-pull-secrets[pull secret from your Docker credentials and add it to your service account].
+
+include::modules/virt-downloading-vddk.adoc[leveloffset=+1]
 include::modules/virt-creating-vddk-image.adoc[leveloffset=+1]
 include::modules/virt-importing-vmware-vm.adoc[leveloffset=+1]