Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding CSM 1.10.2 changes #327

Merged
merged 5 commits into from
May 15, 2024
Merged

Adding CSM 1.10.2 changes #327

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
183869e
Adding 10.2 changes
boyamurthy May 8, 2024
025ff1f
Changing version from 10.2 to 10.1
boyamurthy May 9, 2024
74c8dd6
Adding warning message for unsupported versions
boyamurthy May 10, 2024
7da575b
Update verify.sh
boyamurthy May 14, 2024
a8cdedc
updated cert-csi link
boyamurthy May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dell-csi-helm-installer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This project provides the following capabilitites, each one is discussed in deta


Most of these usages require the creation/specification of a values file. These files specify configuration settings that are passed into the driver and configure it for use. To create one of these files, the following steps should be followed:
1. Download a template file for the driver to a new location, naming this new file is at the users discretion. The template files are always found at `https://github.com/dell/helm-charts/raw/csi-powerstore-2.10.0/charts/csi-powerstore/values.yaml`
1. Download a template file for the driver to a new location, naming this new file is at the users discretion. The template files are always found at `https://github.com/dell/helm-charts/raw/csi-powerstore-2.10.1/charts/csi-powerstore/values.yaml`
2. Edit the file such that it contains the proper configuration settings for the specific environment. These files are yaml formatted so maintaining the file structure is important.

For example, to create a values file for the PowerStore driver the following steps can be executed
Expand All @@ -45,7 +45,7 @@ For example, to create a values file for the PowerStore driver the following ste
cd dell-csi-helm-installer

# download the template file
wget -O my-powerstore-settings.yaml https://github.com/dell/helm-charts/raw/csi-powerstore-2.10.0/charts/csi-powerstore/values.yaml
wget -O my-powerstore-settings.yaml https://github.com/dell/helm-charts/raw/csi-powerstore-2.10.1/charts/csi-powerstore/values.yaml

# edit the newly created values file
vi my-powerstore-settings.yaml
Expand Down
4 changes: 2 additions & 2 deletions dell-csi-helm-installer/csi-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
DRIVERDIR="${SCRIPTDIR}/../"
HELMCHARTVERSION="csi-powerstore-2.10.0"
HELMCHARTVERSION="csi-powerstore-2.10.1"
DRIVER="csi-powerstore"
VERIFYSCRIPT="${SCRIPTDIR}/verify.sh"
PROG="${0}"
NODE_VERIFY=1
VERIFY=1
MODE="install"
DEFAULT_DRIVER_VERSION="v2.10.0"
DEFAULT_DRIVER_VERSION="v2.10.1"
WATCHLIST=""

# export the name of the debug log, so child processes will see it
Expand Down
18 changes: 9 additions & 9 deletions dell-csi-helm-installer/csi-offline-bundle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ 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.10.0
dellemc/csi-isilon:v2.10.1
dellemc/csi-metadata-retriever:v1.6.0
dellemc/csipowermax-reverseproxy:v2.6.0
dellemc/csi-powermax:v2.10.0
dellemc/csi-powerstore:v2.10.0
dellemc/csi-unity:v2.10.0
dellemc/csi-vxflexos:v2.10.0
dellemc/csi-powermax:v2.10.1
dellemc/csi-powerstore:v2.10.1
dellemc/csi-unity:v2.10.1
dellemc/csi-vxflexos:v2.10.1
dellemc/csm-authorization-sidecar:v1.9.0
dellemc/csm-metrics-powerflex:v1.5.0
dellemc/csm-metrics-powerscale:v1.2.0
Expand Down Expand Up @@ -176,8 +176,8 @@ Preparing a offline bundle for installation
*
* Loading docker images

Loaded image: docker.io/dellemc/csi-powerstore:v2.10.0
Loaded image: docker.io/dellemc/csi-isilon:v2.10.0
Loaded image: docker.io/dellemc/csi-powerstore:v2.10.1
Loaded image: docker.io/dellemc/csi-isilon:v2.10.1
...
...
Loaded image: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
Expand All @@ -186,7 +186,7 @@ Loaded image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2
*
* Tagging and pushing images

dellemc/csi-isilon:v2.10.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.10.0
dellemc/csi-isilon:v2.10.1 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.10.1
dellemc/csi-metadata-retriever:v1.6.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.6.0
...
...
Expand All @@ -196,7 +196,7 @@ 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.10.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.10.0
changing: dellemc/csi-isilon:v2.10.1 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.10.1
changing: dellemc/csi-metadata-retriever:v1.6.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.6.0
...
...
Expand Down
2 changes: 1 addition & 1 deletion dell-csi-helm-installer/csi-offline-bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ CREATE="false"
PREPARE="false"
REGISTRY=""
DRIVER="csi-powerstore"
HELMCHARTVERSION="csi-powerstore-2.10.0"
HELMCHARTVERSION="csi-powerstore-2.10.1"

while getopts "cprv:h" opt; do
case $opt in
Expand Down
2 changes: 1 addition & 1 deletion dell-csi-helm-installer/verify-csi-powerstore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# verify-csi-powerstore method
function verify-csi-powerstore() {
verify_k8s_versions "1.24" "1.29"
verify_openshift_versions "4.13" "4.14"
verify_openshift_versions "4.13" "4.15"
verify_namespace "${NS}"
verify_required_secrets "${RELEASE}-config"
verify_alpha_snap_resources
Expand Down
7 changes: 5 additions & 2 deletions dell-csi-helm-installer/verify.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ function verify_k8s_versions() {
error=0
if [[ ${V} < ${MIN} ]]; then
error=1
found_error "Kubernetes version ${V} is too old. Minimum required version is: ${MIN}"
found_warning "Kubernetes version ${V} is too old. Minimum required version is: ${MIN}"
found_warning "To ensure the driver is fully supported run cert-csi and make sure all tests pass. More details: https://dell.github.io/csm-docs/docs/cert-csi/"
fi
check_error error

Expand Down Expand Up @@ -284,7 +285,8 @@ function verify_openshift_versions() {
error=0
if (( ${V%%.*} < ${MIN%%.*} || ( ${V%%.*} == ${MIN%%.*} && ${V##*.} < ${MIN##*.} ) )) ; then
error=1
found_error "OpenShift version ${V} is too old. Minimum required version is: ${MIN}"
found_warning "OpenShift version ${V} is too old. Minimum required version is: ${MIN}"
found_warning "To ensure the driver is fully supported run cert-csi and make sure all tests pass. More details: https://dell.github.io/csm-docs/docs/cert-csi/"
fi
check_error error

Expand All @@ -295,6 +297,7 @@ function verify_openshift_versions() {
if (( ${V%%.*} > ${MAX%%.*} || ( ${V%%.*} == ${MAX%%.*} && ${V##*.} > ${MAX##*.} ) )) ; then
error=1
found_warning "OpenShift version ${V} is newer than the version that has been tested. Latest tested version is: ${MAX}"
found_warning "To ensure the driver is fully supported run cert-csi and make sure all tests pass. More details: https://dell.github.io/csm-docs/docs/cert-csi/"
fi
check_error error
}
Expand Down
2 changes: 1 addition & 1 deletion docker-files/Dockerfile.centos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LABEL vendor="Dell Inc." \
name="csi-powerstore" \
summary="CSI Driver for Dell EMC PowerStore" \
description="CSI Driver for provisioning persistent storage from Dell EMC PowerStore" \
version="2.10.0" \
version="2.10.1" \
license="Apache-2.0"

COPY licenses /licenses
Expand Down
2 changes: 1 addition & 1 deletion docker-files/Dockerfile.ubi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ LABEL vendor="Dell Inc." \
name="csi-powerstore" \
summary="CSI Driver for Dell EMC PowerStore" \
description="CSI Driver for provisioning persistent storage from Dell EMC PowerStore" \
version="2.10.0" \
version="2.10.1" \
license="Apache-2.0"

COPY licenses /licenses
Expand Down
2 changes: 1 addition & 1 deletion docker-files/Dockerfile.ubi.alt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ LABEL vendor="Dell Inc." \
name="csi-powerstore" \
summary="CSI Driver for Dell EMC PowerStore" \
description="CSI Driver for provisioning persistent storage from Dell EMC PowerStore" \
version="2.10.0" \
version="2.10.1" \
license="Apache-2.0"

COPY licenses /licenses
Expand Down
2 changes: 1 addition & 1 deletion docker-files/Dockerfile.ubi.micro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ LABEL vendor="Dell Inc." \
name="csi-powerstore" \
summary="CSI Driver for Dell EMC PowerStore" \
description="CSI Driver for provisioning persistent storage from Dell EMC PowerStore" \
version="2.10.0" \
version="2.10.1" \
license="Apache-2.0"

COPY licenses /licenses
Expand Down
2 changes: 1 addition & 1 deletion docker-files/Dockerfile.ubi.min
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LABEL vendor="Dell Inc." \
name="csi-powerstore" \
summary="CSI Driver for Dell EMC PowerStore" \
description="CSI Driver for provisioning persistent storage from Dell EMC PowerStore" \
version="2.10.0" \
version="2.10.1" \
license="Apache-2.0"

COPY licenses /licenses
Expand Down