diff --git a/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc b/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc index b4a35e3fbd9a..1bfe84e0a150 100644 --- a/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc +++ b/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc @@ -78,6 +78,10 @@ include::modules/registry-configuring-storage-vsphere.adoc[leveloffset=+3] include::modules/installation-registry-storage-non-production.adoc[leveloffset=+3] +include::modules/installation-registry-storage-block-recreate-rollout.adoc[leveloffset=+3] + +For instructions about configuring registry storage so that it references the correct PVC, see xref:../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Configuring the registry for vSphere]. + include::modules/installation-complete-user-infra.adoc[leveloffset=+1] diff --git a/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc b/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc index 912ffda84826..44de2bc02a02 100644 --- a/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc +++ b/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc @@ -59,6 +59,10 @@ include::modules/installation-registry-storage-config.adoc[leveloffset=+2] include::modules/registry-configuring-storage-vsphere.adoc[leveloffset=+3] +include::modules/installation-registry-storage-block-recreate-rollout.adoc[leveloffset=+3] + +For instructions about configuring registry storage so that it references the correct PVC, see xref:../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Configuring the registry for vSphere]. + .Next steps * xref:../../installing/install_config/customizations.adoc#customizations[Customize your cluster]. diff --git a/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc b/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc index 3739e0e4d1b1..d0f64f6ba559 100644 --- a/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc +++ b/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc @@ -69,6 +69,10 @@ include::modules/installation-registry-storage-config.adoc[leveloffset=+2] include::modules/registry-configuring-storage-vsphere.adoc[leveloffset=+3] +include::modules/installation-registry-storage-block-recreate-rollout.adoc[leveloffset=+3] + +For instructions about configuring registry storage so that it references the correct PVC, see xref:../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Configuring the registry for vSphere]. + .Next steps * xref:../../installing/install_config/customizations.adoc#customizations[Customize your cluster]. diff --git a/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc b/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc index 52a941268556..c3a56856dc9c 100644 --- a/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc +++ b/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc @@ -53,6 +53,9 @@ include::modules/installation-registry-storage-config.adoc[leveloffset=+2] include::modules/registry-configuring-storage-vsphere.adoc[leveloffset=+3] +include::modules/installation-registry-storage-block-recreate-rollout.adoc[leveloffset=+3] + +For instructions about configuring registry storage so that it references the correct PVC, see xref:../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Configuring the registry for vSphere]. .Next steps diff --git a/installing/installing_vsphere/installing-vsphere-network-customizations.adoc b/installing/installing_vsphere/installing-vsphere-network-customizations.adoc index 33c6f3b159c6..cd6508d04e05 100644 --- a/installing/installing_vsphere/installing-vsphere-network-customizations.adoc +++ b/installing/installing_vsphere/installing-vsphere-network-customizations.adoc @@ -69,6 +69,10 @@ include::modules/registry-removed.adoc[leveloffset=+2] include::modules/installation-registry-storage-config.adoc[leveloffset=+2] +include::modules/installation-registry-storage-block-recreate-rollout.adoc[leveloffset=+3] + +For instructions about configuring registry storage so that it references the correct PVC, see xref:../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Configuring the registry for vSphere]. + include::modules/installation-complete-user-infra.adoc[leveloffset=+1] diff --git a/installing/installing_vsphere/installing-vsphere.adoc b/installing/installing_vsphere/installing-vsphere.adoc index 3efb567179e6..fe81e3283b7f 100644 --- a/installing/installing_vsphere/installing-vsphere.adoc +++ b/installing/installing_vsphere/installing-vsphere.adoc @@ -71,6 +71,10 @@ include::modules/registry-configuring-storage-vsphere.adoc[leveloffset=+3] include::modules/installation-registry-storage-non-production.adoc[leveloffset=+3] +include::modules/installation-registry-storage-block-recreate-rollout.adoc[leveloffset=+3] + +For instructions about configuring registry storage so that it references the correct PVC, see xref:../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Configuring the registry for vSphere]. + include::modules/installation-complete-user-infra.adoc[leveloffset=+1] diff --git a/modules/installation-registry-storage-block-recreate-rollout.adoc b/modules/installation-registry-storage-block-recreate-rollout.adoc new file mode 100644 index 000000000000..0b61cc73658a --- /dev/null +++ b/modules/installation-registry-storage-block-recreate-rollout.adoc @@ -0,0 +1,27 @@ +// Module included in the following assemblies: +// +// * installing/installing_vsphere/installing-vsphere.adoc +// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc +// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc +// * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc +// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc +// * installing/installing_vsphere/installing-vsphere.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc +// * registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc + +[id="installation-registry-storage-block-recreate-rollout_{context}"] += Configuring block registry storage for VMware vSphere + +To allow the image registry to use block storage types such as vSphere Virtual Machine Disk (VMDK) during upgrades as a cluster administrator, you can use the `Recreate` rollout strategy. + +.Procedure + +. To set the image registry storage as a block storage type, patch the registry so that it uses the `Recreate` rollout strategy and runs with only `1` replica: ++ +---- +$ oc patch config.imageregistry.operator.openshift.io/cluster --type=merge -p '{"spec":{"rolloutStrategy":"Recreate","replicas":1}}' +---- ++ +. Provision the PV for the block storage device, and create a PVC for that volume. The requested block volume uses the ReadWriteOnce (RWO) access mode. ++ +. Edit the registry configuration so that it references the correct PVC. diff --git a/modules/installation-registry-storage-config.adoc b/modules/installation-registry-storage-config.adoc index 005c00d5ad80..29ed3962398f 100644 --- a/modules/installation-registry-storage-config.adoc +++ b/modules/installation-registry-storage-config.adoc @@ -36,12 +36,12 @@ endif::aws[] ifndef::aws[] The `image-registry` Operator is not initially available for platforms that do not provide default storage. After installation, you must configure your -registry to use storage so the Registry Operator is made available. +registry to use storage so that the Registry Operator is made available. endif::aws[] -Instructions for both configuring a PersistentVolume, which is required -for production clusters, and for configuring an empty directory as the storage -location, which is available for only non-production clusters, are shown. +Instructions are shown for configuring a PersistentVolume, which is required for production clusters. Where applicable, instructions are shown for configuring an empty directory as the storage location, which is available for only non-production clusters. + +Additional instructions are provided for allowing the image registry to use block storage types by using the `Recreate` rollout strategy during upgrades. ifeval::["{context}" == "installing-aws-user-infra"] :!aws: diff --git a/registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc b/registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc index 340bf96d5765..0ad97db60f01 100644 --- a/registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc +++ b/registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc @@ -14,6 +14,10 @@ include::modules/registry-configuring-storage-vsphere.adoc[leveloffset=+1] include::modules/installation-registry-storage-non-production.adoc[leveloffset=+1] +include::modules/installation-registry-storage-block-recreate-rollout.adoc[leveloffset=+1] + +For instructions about configuring registry storage so that it references the correct PVC, see xref:../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Configuring the registry for vSphere]. + [id="configuring-registry-storage-vsphere-addtl-resources"] == Additional resources