Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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.15.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.16.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
Expand All @@ -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.15.0/charts/csi-unity/values.yaml
wget -O my-unity-settings.yaml https://github.com/dell/helm-charts/raw/csi-unity-2.16.0/charts/csi-unity/values.yaml

# edit the newly created values file
vi my-unity-settings.yaml
Expand Down
8 changes: 4 additions & 4 deletions dell-csi-helm-installer/csi-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ PROG="${0}"
NODE_VERIFY=1
VERIFY=1
MODE="install"
DEFAULT_DRIVER_VERSION="v2.15.0"
DEFAULT_DRIVER_VERSION="v2.16.0"
WATCHLIST=""

DRIVERVERSION="csi-unity-2.15.0"
DRIVERVERSION="csi-unity-2.16.0"

# usage will print command execution help and then exit
function usage() {
Expand Down Expand Up @@ -416,8 +416,8 @@ helm --help >&/dev/null || {
OPENSHIFT=$(isOpenShift)

# Get the kubernetes major and minor version numbers.
kMajorVersion=$(run_command kubectl version -o="yaml" | grep -A8 'serverVersion:' | grep 'major'| egrep -o '[0-9]+')
kMinorVersion=$(run_command kubectl version -o="yaml" | grep -A8 'serverVersion:' | grep 'minor'| egrep -o '[0-9]+')
kMajorVersion=$(run_command kubectl version | grep 'Server Version' | sed -E 's/.*v([0-9]+)\.[0-9]+\.[0-9]+.*/\1/')
kMinorVersion=$(run_command kubectl version | grep 'Server Version' | sed -E 's/.*v[0-9]+\.([0-9]+)\.[0-9]+.*/\1/')
kNonGAVersion=$(run_command kubectl version | grep 'Server Version' | sed -n 's/.*\(-[alpha|beta][^ ]*\).*/\1/p')

# validate the parameters passed in
Expand Down
32 changes: 16 additions & 16 deletions dell-csi-helm-installer/csi-offline-bundle.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,21 @@ 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.15.0
quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.10.0
quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.13.0
quay.io/dell/container-storage-modules/csi-powermax:v2.15.0
quay.io/dell/container-storage-modules/csi-powerstore:v2.15.0
quay.io/dell/container-storage-modules/csi-unity:v2.15.0
quay.io/dell/container-storage-modules/csi-vxflexos:v2.15.0
quay.io/dell/container-storage-modules/csi-isilon:v2.16.0
quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.11.0
quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.14.0
quay.io/dell/container-storage-modules/csi-powermax:v2.16.0
quay.io/dell/container-storage-modules/csi-powerstore:v2.16.0
quay.io/dell/container-storage-modules/csi-unity:v2.16.0
quay.io/dell/container-storage-modules/csi-vxflexos:v2.16.0
quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.14.0
quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.12.0
quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.9.0
quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.14.0
quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.11.0
quay.io/dell/container-storage-modules/csm-topology:v1.12.0
quay.io/dell/container-storage-modules/dell-csi-replicator:v1.12.0
quay.io/dell/container-storage-modules/dell-replication-controller:v1.12.0
quay.io/dell/container-storage-modules/dell-csi-replicator:v1.14.0
quay.io/dell/container-storage-modules/dell-replication-controller:v1.14.0
dellemc/sdc:4.5.2.1
quay.io/dell/container-storage-modules/dell-csm-operator:v1.9.0
quay.io/dell/container-storage-modules/dell-csm-operator:v1.11.0
registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9:v4.16.0-202409051837.p0.g8ea2c99.assembly.stream.el9
nginxinc/nginx-unprivileged:1.27
otel/opentelemetry-collector:0.42.0
Expand Down Expand Up @@ -189,8 +189,8 @@ Preparing a offline bundle for installation
*
* Loading docker images

Loaded image: quay.io/dell/container-storage-modules/csi-powerstore:v2.15.0
Loaded image: quay.io/dell/container-storage-modules/csi-isilon:v2.15.0
Loaded image: quay.io/dell/container-storage-modules/csi-powerstore:v2.16.0
Loaded image: quay.io/dell/container-storage-modules/csi-isilon:v2.16.0
...
...
Loaded image: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
Expand All @@ -199,7 +199,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.15.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.15.0
quay.io/dell/container-storage-modules/csi-isilon:v2.16.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.16.0
quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.9.0
...
...
Expand All @@ -209,7 +209,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.15.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.15.0
changing: quay.io/dell/container-storage-modules/csi-isilon:v2.16.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.16.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
...
...
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 @@ -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.15.0"
DRIVERVERSION="csi-unity-2.16.0"

while getopts "cprv:h" opt; do
case $opt in
Expand Down
4 changes: 2 additions & 2 deletions dell-csi-helm-installer/verify-csi-unity.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

# verify-csi-unity method
function verify-csi-unity() {
verify_k8s_versions "1.32" "1.34"
verify_openshift_versions "4.18" "4.19"
verify_k8s_versions "1.33" "1.35"
verify_openshift_versions "4.18" "4.20"
verify_namespace "${NS}"
verify_required_secrets "${RELEASE}-creds"
verify_optional_secrets "${RELEASE}-certs"
Expand Down
4 changes: 2 additions & 2 deletions dell-csi-helm-installer/verify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,8 @@ kubectl --help >&/dev/null || {
MINION_NODES=$(run_command kubectl get nodes -o wide | grep -v -e master -e INTERNAL | awk ' { print $6; }')
MASTER_NODES=$(run_command kubectl get nodes -o wide | awk ' /master/{ print $6; }')
# Get the kubernetes major and minor version numbers.
kMajorVersion=$(run_command kubectl version -o="yaml" | grep -A8 'serverVersion:' | grep 'major'| egrep -o '[0-9]+')
kMinorVersion=$(run_command kubectl version -o="yaml" | grep -A8 'serverVersion:' | grep 'minor'| egrep -o '[0-9]+')
kMajorVersion=$(run_command kubectl version | grep 'Server Version' | sed -E 's/.*v([0-9]+)\.[0-9]+\.[0-9]+.*/\1/')
kMinorVersion=$(run_command kubectl version | grep 'Server Version' | sed -E 's/.*v[0-9]+\.([0-9]+)\.[0-9]+.*/\1/')
kNonGAVersion=$(run_command kubectl version | grep 'Server Version' | sed -n 's/.*\(-[alpha|beta][^ ]*\).*/\1/p')

while getopts ":h-:" optchar; do
Expand Down
Loading