From 4812a79f1075902e14e64954f90bb6ddfa710557 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Mon, 6 Jan 2025 16:53:25 -0500 Subject: [PATCH 1/2] bump versions for csm 1.13.0 --- Dockerfile.podman | 2 +- dell-csi-helm-installer/README.md | 4 ++-- dell-csi-helm-installer/csi-install.sh | 4 ++-- dell-csi-helm-installer/csi-offline-bundle.md | 18 +++++++++--------- dell-csi-helm-installer/csi-offline-bundle.sh | 2 +- dell-csi-helm-installer/verify-csi-unity.sh | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Dockerfile.podman b/Dockerfile.podman index 26fe5bf..ee44747 100644 --- a/Dockerfile.podman +++ b/Dockerfile.podman @@ -28,6 +28,6 @@ LABEL vendor="Dell Inc." \ name="csi-unity" \ summary="CSI Driver for Dell Unity XT" \ description="CSI Driver for provisioning persistent storage from Dell Unity XT" \ - version="2.12.0" \ + version="2.13.0" \ license="Apache-2.0" COPY csi-unity/licenses /licenses diff --git a/dell-csi-helm-installer/README.md b/dell-csi-helm-installer/README.md index 3042089..a312632 100644 --- a/dell-csi-helm-installer/README.md +++ b/dell-csi-helm-installer/README.md @@ -49,7 +49,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-unity-2.12.0/charts/csi-unity/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-unity-2.13.0/charts/csi-unity/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 Unity XT driver the following steps can be executed @@ -58,7 +58,7 @@ For example, to create a values file for the Unity XT driver the following steps cd dell-csi-helm-installer # download the template file -wget -O my-unity-settings.yaml https://github.com/dell/helm-charts/raw/csi-unity-2.12.0/charts/csi-unity/values.yaml +wget -O my-unity-settings.yaml https://github.com/dell/helm-charts/raw/csi-unity-2.13.0/charts/csi-unity/values.yaml # edit the newly created values file vi my-unity-settings.yaml diff --git a/dell-csi-helm-installer/csi-install.sh b/dell-csi-helm-installer/csi-install.sh index 483f641..0396c50 100755 --- a/dell-csi-helm-installer/csi-install.sh +++ b/dell-csi-helm-installer/csi-install.sh @@ -16,10 +16,10 @@ PROG="${0}" NODE_VERIFY=1 VERIFY=1 MODE="install" -DEFAULT_DRIVER_VERSION="v2.12.0" +DEFAULT_DRIVER_VERSION="v2.13.0" WATCHLIST="" -DRIVERVERSION="csi-unity-2.12.0" +DRIVERVERSION="csi-unity-2.13.0" # usage will print command execution help and then exit function usage() { diff --git a/dell-csi-helm-installer/csi-offline-bundle.md b/dell-csi-helm-installer/csi-offline-bundle.md index 2540b82..e261e86 100644 --- a/dell-csi-helm-installer/csi-offline-bundle.md +++ b/dell-csi-helm-installer/csi-offline-bundle.md @@ -91,13 +91,13 @@ For example, here is the output of a request to build an offline bundle for the * * Pulling and saving container images - quay.io/dell/container-storage-modules/csi-isilon:v2.12.0 + quay.io/dell/container-storage-modules/csi-isilon:v2.13.0 quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0 quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0 - quay.io/dell/container-storage-modules/csi-powermax:v2.12.0 - quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0 - quay.io/dell/container-storage-modules/csi-unity:v2.12.0 - quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0 + quay.io/dell/container-storage-modules/csi-powermax:v2.13.0 + quay.io/dell/container-storage-modules/csi-powerstore:v2.13.0 + quay.io/dell/container-storage-modules/csi-unity:v2.13.0 + quay.io/dell/container-storage-modules/csi-vxflexos:v2.13.0 quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0 quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.10.0 quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.7.0 @@ -188,8 +188,8 @@ Preparing a offline bundle for installation * * Loading docker images -Loaded image: quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0 -Loaded image: quay.io/dell/container-storage-modules/csi-isilon:v2.12.0 +Loaded image: quay.io/dell/container-storage-modules/csi-powerstore:v2.13.0 +Loaded image: quay.io/dell/container-storage-modules/csi-isilon:v2.13.0 ... ... Loaded image: registry.k8s.io/sig-storage/csi-resizer:v1.9.2 @@ -198,7 +198,7 @@ Loaded image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 * * Tagging and pushing images - quay.io/dell/container-storage-modules/csi-isilon:v2.12.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.12.0 + quay.io/dell/container-storage-modules/csi-isilon:v2.13.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.13.0 quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.9.0 ... ... @@ -208,7 +208,7 @@ Loaded image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 * * Preparing files within /root/dell-csm-operator-bundle - changing: quay.io/dell/container-storage-modules/csi-isilon:v2.12.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.12.0 + changing: quay.io/dell/container-storage-modules/csi-isilon:v2.13.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.13.0 changing: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.9.0 ... ... diff --git a/dell-csi-helm-installer/csi-offline-bundle.sh b/dell-csi-helm-installer/csi-offline-bundle.sh index 6724428..8660989 100755 --- a/dell-csi-helm-installer/csi-offline-bundle.sh +++ b/dell-csi-helm-installer/csi-offline-bundle.sh @@ -232,7 +232,7 @@ DRIVER="csi-unity" SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" REPODIR="$( dirname "${SCRIPTDIR}" )" -DRIVERVERSION="csi-unity-2.12.0" +DRIVERVERSION="csi-unity-2.13.0" while getopts "cprv:h" opt; do case $opt in diff --git a/dell-csi-helm-installer/verify-csi-unity.sh b/dell-csi-helm-installer/verify-csi-unity.sh index f250816..148fdfe 100644 --- a/dell-csi-helm-installer/verify-csi-unity.sh +++ b/dell-csi-helm-installer/verify-csi-unity.sh @@ -10,7 +10,7 @@ # verify-csi-unity method function verify-csi-unity() { - verify_k8s_versions "1.25" "1.31" + verify_k8s_versions "1.30" "1.32" verify_openshift_versions "4.16" "4.17" verify_namespace "${NS}" verify_required_secrets "${RELEASE}-creds" From 80b07f49538887eb374d5e24d1f300906ff79a8c Mon Sep 17 00:00:00 2001 From: lukeatdell <115811384+lukeatdell@users.noreply.github.com> Date: Tue, 7 Jan 2025 12:53:53 -0600 Subject: [PATCH 2/2] update ocp compat versions --- dell-csi-helm-installer/verify-csi-unity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dell-csi-helm-installer/verify-csi-unity.sh b/dell-csi-helm-installer/verify-csi-unity.sh index 148fdfe..b05b508 100644 --- a/dell-csi-helm-installer/verify-csi-unity.sh +++ b/dell-csi-helm-installer/verify-csi-unity.sh @@ -11,7 +11,7 @@ # verify-csi-unity method function verify-csi-unity() { verify_k8s_versions "1.30" "1.32" - verify_openshift_versions "4.16" "4.17" + verify_openshift_versions "4.17" "4.18" verify_namespace "${NS}" verify_required_secrets "${RELEASE}-creds" verify_optional_secrets "${RELEASE}-certs"