diff --git a/dell-csi-helm-installer/csi-offline-bundle.md b/dell-csi-helm-installer/csi-offline-bundle.md index 1ee5d7f1..01027ef9 100644 --- a/dell-csi-helm-installer/csi-offline-bundle.md +++ b/dell-csi-helm-installer/csi-offline-bundle.md @@ -88,21 +88,21 @@ For example, here is the output of a request to build an offline bundle for the * * Pulling and saving container images - dellemc/csi-isilon:v2.12.0 - dellemc/csi-metadata-retriever:v1.6.0 - dellemc/csipowermax-reverseproxy:v2.6.0 - dellemc/csi-powermax:v2.9.0 - dellemc/csi-powerstore:v2.9.0 - dellemc/csi-unity:v2.8.0 - dellemc/csi-vxflexos:v2.9.0 - dellemc/csm-authorization-sidecar:v1.9.0 - dellemc/csm-metrics-powerflex:v1.5.0 - dellemc/csm-metrics-powerscale:v1.2.0 - dellemc/csm-topology:v1.5.0 - dellemc/dell-csi-replicator:v1.7.0 - dellemc/dell-replication-controller:v1.7.0 - dellemc/sdc:4.5 - docker.io/dellemc/dell-csm-operator:v1.3.0 + quay.io/dell/container-storage-modules/csi-isilon:v2.12.0 + quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.6.0 + quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.6.0 + quay.io/dell/container-storage-modules/csi-powermax:v2.9.0 + quay.io/dell/container-storage-modules/csi-powerstore:v2.9.0 + quay.io/dell/container-storage-modules/csi-unity:v2.8.0 + quay.io/dell/container-storage-modules/csi-vxflexos:v2.9.0 + quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.9.0 + quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.5.0 + quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.2.0 + quay.io/dell/container-storage-modules/csm-topology:v1.5.0 + quay.io/dell/container-storage-modules/dell-csi-replicator:v1.7.0 + quay.io/dell/container-storage-modules/dell-replication-controller:v1.7.0 + quay.io/dell/container-storage-modules/sdc:4.5 + quay.io/dell/container-storage-modules/dell-csm-operator:v1.3.0 gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 nginxinc/nginx-unprivileged:1.20 otel/opentelemetry-collector:0.42.0 @@ -190,8 +190,8 @@ Preparing a offline bundle for installation * * Loading docker images -Loaded image: docker.io/dellemc/csi-powerstore:v2.9.0 -Loaded image: docker.io/dellemc/csi-isilon:v2.9.0 +Loaded image: quay.io/dell/container-storage-modules/csi-powerstore:v2.9.0 +Loaded image: quay.io/dell/container-storage-modules/csi-isilon:v2.9.0 ... ... Loaded image: registry.k8s.io/sig-storage/csi-resizer:v1.9.2 @@ -200,8 +200,8 @@ Loaded image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 * * Tagging and pushing images - dellemc/csi-isilon:v2.9.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.9.0 - dellemc/csi-metadata-retriever:v1.6.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.6.0 + quay.io/dell/container-storage-modules/csi-isilon:v2.9.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.9.0 + quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.6.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.6.0 ... ... registry.k8s.io/sig-storage/csi-resizer:v1.9.2 -> localregistry:5000/dell-csm-operator/csi-resizer:v1.9.2 @@ -210,8 +210,8 @@ Loaded image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 * * Preparing files within /root/dell-csm-operator-bundle - changing: dellemc/csi-isilon:v2.9.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.9.0 - changing: dellemc/csi-metadata-retriever:v1.6.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.6.0 + changing: quay.io/dell/container-storage-modules/csi-isilon:v2.9.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.9.0 + changing: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.6.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.6.0 ... ... changing: registry.k8s.io/sig-storage/csi-resizer:v1.9.2 -> localregistry:5000/dell-csm-operator/csi-resizer:v1.9.2 diff --git a/dell-csi-helm-installer/csi-offline-bundle.sh b/dell-csi-helm-installer/csi-offline-bundle.sh index 35561b61..d7041a21 100755 --- a/dell-csi-helm-installer/csi-offline-bundle.sh +++ b/dell-csi-helm-installer/csi-offline-bundle.sh @@ -36,7 +36,7 @@ status() { echo echo "*" echo "* $@" - echo + echo } # run_command @@ -88,7 +88,7 @@ build_image_manifest() { done # Forming this only for drivers supporting standalone helm charts - if [ ! -z ${DRIVERREPO} ]; then + if [ ! -z ${DRIVERREPO} ]; then echo "${DRIVERREPO}/${DRIVERNAME}\:${DRIVERVERSIONVALUESYAML}" echo "${DRIVERREPO}/${DRIVERNAME}:${DRIVERVERSIONVALUESYAML}" >> "${IMAGEMANIFEST}.tmp" fi @@ -117,7 +117,7 @@ archive_images() { fi done < "${IMAGEMANIFEST}" -} +} # restore_images # load the images from an archive into the local registry @@ -273,7 +273,7 @@ if [ ! -d "$REPODIR/helm-charts" ]; then git clone --quiet -c advice.detachedHead=false -b $DRIVERVERSION https://github.com/dell/helm-charts fi mv helm-charts $REPODIR -else +else if [ -d "$SCRIPTDIR/helm-charts" ]; then rm -rf $SCRIPTDIR/helm-charts fi @@ -362,7 +362,7 @@ if [ "${REGISTRY: -1}" != "/" ]; then fi # figure out if we should use docker or podman, preferring docker -DOCKER=$(which docker 2>/dev/null || which podman 2>/dev/null) +DOCKER=$(which docker 2>/dev/null || which podman 2>/dev/null) if [ "${DOCKER}" == "" ]; then echo "Unable to find either docker or podman in $PATH" exit 1