Skip to content

Commit

Permalink
Merge pull request #284 from dell/KRV-29028-quay.io
Browse files Browse the repository at this point in the history
Update image references to quay.io
  • Loading branch information
shaynafinocchiaro authored Oct 24, 2024
2 parents d31b42e + c4109b1 commit a270e25
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
42 changes: 21 additions & 21 deletions dell-csi-helm-installer/csi-offline-bundle.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions dell-csi-helm-installer/csi-offline-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ status() {
echo
echo "*"
echo "* $@"
echo
echo
}

# run_command
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -117,7 +117,7 @@ archive_images() {
fi
done < "${IMAGEMANIFEST}"

}
}

# restore_images
# load the images from an archive into the local registry
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a270e25

Please sign in to comment.