Skip to content

Commit

Permalink
Merge branch 'main' into add-interface-filters
Browse files Browse the repository at this point in the history
  • Loading branch information
shanmydell authored Jun 24, 2024
2 parents c89594e + 72c3e84 commit b13db66
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@ LABEL vendor="Dell Inc." \
name="csi-powermax" \
summary="CSI Driver for Dell PowerMax" \
description="CSI Driver for provisioning persistent storage from Dell PowerMax" \
version="2.10.1" \
version="2.11.0" \
license="Apache-2.0"
COPY csi-powermax/licenses /licenses
2 changes: 1 addition & 1 deletion csireverseproxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ LABEL vendor="Dell Inc." \
name="csipowermax-reverseproxy" \
summary="CSI PowerMax Reverse Proxy" \
description="CSI PowerMax Reverse Proxy which helps manage connections with Unisphere for PowerMax" \
version="2.9.1" \
version="2.10.0" \
license="Apache-2.0"
COPY licenses /licenses
# Import from builder.
Expand Down
4 changes: 2 additions & 2 deletions dell-csi-helm-installer/README.md
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-powermax-2.10.1/charts/csi-powermax/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-powermax-2.11.0/charts/csi-powermax/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 PowerMax driver the following steps can be executed
Expand All @@ -45,7 +45,7 @@ For example, to create a values file for the PowerMax driver the following steps
cd dell-csi-helm-installer
# Download the template file
wget -O my-powermax-settings.yaml https://github.com/dell/helm-charts/raw/csi-powermax-2.10.1/charts/csi-powermax/values.yaml
wget -O my-powermax-settings.yaml https://github.com/dell/helm-charts/raw/csi-powermax-2.11.0/charts/csi-powermax/values.yaml
# edit the newly created values file
vi my-powermax-settings.yaml
Expand Down
2 changes: 1 addition & 1 deletion dell-csi-helm-installer/csi-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PROG="${0}"
NODE_VERIFY=1
VERIFY=1
MODE="install"
DEFAULT_DRIVER_VERSION="v2.10.1"
DEFAULT_DRIVER_VERSION="v2.11.0"
WATCHLIST=""

#
Expand Down
20 changes: 10 additions & 10 deletions dell-csi-helm-installer/csi-offline-bundle.md
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.1
dellemc/csi-isilon:v2.11.0
dellemc/csi-metadata-retriever:v1.6.0
dellemc/csipowermax-reverseproxy:v2.9.2
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/csipowermax-reverseproxy:v2.10.0
dellemc/csi-powermax:v2.11.0
dellemc/csi-powerstore:v2.11.0
dellemc/csi-unity:v2.11.0
dellemc/csi-vxflexos:v2.11.0
dellemc/csm-authorization-sidecar:v1.10.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.1
Loaded image: docker.io/dellemc/csi-isilon:v2.10.1
Loaded image: docker.io/dellemc/csi-powerstore:v2.11.0
Loaded image: docker.io/dellemc/csi-isilon:v2.11.0
...
...
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.1 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.10.1
dellemc/csi-isilon:v2.11.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.11.0
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.1 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.10.1
changing: dellemc/csi-isilon:v2.11.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.11.0
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
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ DRIVER="csi-powermax"
SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
REPODIR="$( dirname "${SCRIPTDIR}" )"

DRIVERVERSION="csi-powermax-2.10.1"
DRIVERVERSION="csi-powermax-2.11.0"

while getopts "cprv:h" opt; do
case $opt in
Expand Down
2 changes: 1 addition & 1 deletion dell-csi-helm-installer/verify-csi-powermax.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# verify-csi-powermax method
function verify-csi-powermax() {
verify_k8s_versions "1.25" "1.29"
verify_k8s_versions "1.25" "1.30"
verify_openshift_versions "4.13" "4.15"
verify_helm_values_version "${DRIVER_VERSION}"
verify_namespace "${NS}"
Expand Down

0 comments on commit b13db66

Please sign in to comment.