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 Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

ARG GOIMAGE
ARG BASEIMAGE
ARG VERSION="2.16.0"
ARG VERSION="2.17.0"

FROM $GOIMAGE AS builder
ARG VERSION
Expand All @@ -36,7 +36,7 @@ LABEL vendor="Dell Technologies" \
name="csi-unity" \
summary="CSI Driver for Dell Unity XT" \
description="CSI Driver for provisioning persistent storage from Dell Unity XT" \
release="1.15.0" \
release="1.17.0" \
version=$VERSION \
license="Apache-2.0"
COPY licenses /licenses
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ Both the Controller and the Node portions of the driver can only be run on nodes
For more detailed information on the driver, please refer to [Container Storage Modules documentation](https://dell.github.io/csm-docs/).



2 changes: 1 addition & 1 deletion core/semver/semver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ func TestErrorExit(t *testing.T) {
return
}
// call the test again with INVOKE_ERROR_EXIT=1 so the errorExit function is invoked and we can check the return code
cmd := exec.Command(os.Args[0], "-test.run=TestErrorExit") // #nosec G204
cmd := exec.Command(os.Args[0], "-test.run=TestErrorExit") // #nosec G204,G702
cmd.Env = append(os.Environ(), "INVOKE_ERROR_EXIT=1")

stderr, err := cmd.StderrPipe()
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 @@ -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.16.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.17.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.16.0/charts/csi-unity/values.yaml
wget -O my-unity-settings.yaml https://github.com/dell/helm-charts/raw/csi-unity-2.17.0/charts/csi-unity/values.yaml

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

DRIVERVERSION="csi-unity-2.16.0"

# usage will print command execution help and then exit
function usage() {
echo
Expand Down Expand Up @@ -125,6 +123,9 @@ while getopts ":h-:" optchar; do
esac
done

# Derive helm chart version from DEFAULT_VERSION (single source of truth)
DRIVERVERSION="${DRIVER}-${DEFAULT_VERSION#v}"

if [ -n "$HELMCHARTVERSION" ]; then
DRIVERVERSION=$HELMCHARTVERSION
fi
Expand All @@ -145,7 +146,6 @@ DRIVERDIR="${SCRIPTDIR}/../helm-charts/charts"
DRIVER="csi-unity"
VERIFYSCRIPT="${SCRIPTDIR}/verify.sh"


# export the name of the debug log, so child processes will see it
export DEBUGLOG="${SCRIPTDIR}/install-debug.log"
declare -a VALIDDRIVERS
Expand Down Expand Up @@ -398,7 +398,7 @@ RELEASE=$(get_release_name "${DRIVER}")
# by default, NODEUSER is root
NODEUSER="${NODEUSER:-root}"
if [[ -z ${DRIVER_VERSION} ]]; then
DRIVER_VERSION=${DEFAULT_DRIVER_VERSION}
DRIVER_VERSION=${DEFAULT_VERSION}
fi


Expand All @@ -416,8 +416,8 @@ helm --help >&/dev/null || {
OPENSHIFT=$(isOpenShift)

# Get the kubernetes major and minor version numbers.
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/')
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]+')
kNonGAVersion=$(run_command kubectl version | grep 'Server Version' | sed -n 's/.*\(-[alpha|beta][^ ]*\).*/\1/p')

# validate the parameters passed in
Expand Down
45 changes: 6 additions & 39 deletions dell-csi-helm-installer/csi-offline-bundle.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,30 +91,9 @@ 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.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.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.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.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
registry.k8s.io/sig-storage/csi-attacher:v4.8.0
registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.14.0
registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
registry.k8s.io/sig-storage/csi-resizer:v1.13.1
registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
...
quay.io/dell/container-storage-modules/csi-unity:v2.17.0
...

*
* Copying necessary files
Expand Down Expand Up @@ -189,32 +168,20 @@ Preparing a offline bundle for installation
*
* Loading docker images

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: quay.io/dell/container-storage-modules/csi-unity:v2.17.0
...
Loaded image: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
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.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
quay.io/dell/container-storage-modules/csi-unity:v2.17.0 -> localregistry:5000/dell-csm-operator/csi-unity:v2.17.0
...
...
registry.k8s.io/sig-storage/csi-resizer:v1.9.2 -> localregistry:5000/dell-csm-operator/csi-resizer:v1.9.2
registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 -> localregistry:5000/dell-csm-operator/csi-snapshotter:v6.3.2

*
* Preparing files within /root/dell-csm-operator-bundle

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
...
changing: quay.io/dell/container-storage-modules/csi-unity:v2.17.0 -> localregistry:5000/dell-csm-operator/csi-unity:v2.17.0
...
changing: registry.k8s.io/sig-storage/csi-resizer:v1.9.2 -> localregistry:5000/dell-csm-operator/csi-resizer:v1.9.2
changing: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 -> localregistry:5000/dell-csm-operator/csi-snapshotter:v6.3.2

*
* Complete
Expand Down
7 changes: 5 additions & 2 deletions dell-csi-helm-installer/csi-offline-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,12 @@ CREATE="false"
PREPARE="false"
REGISTRY=""
DRIVER="csi-unity"
DEFAULT_VERSION="v2.17.0"

# some directories
SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
REPODIR="$( dirname "${SCRIPTDIR}" )"

DRIVERVERSION="csi-unity-2.16.0"

while getopts "cprv:h" opt; do
case $opt in
c)
Expand Down Expand Up @@ -264,6 +263,10 @@ while getopts "cprv:h" opt; do
esac
done

# Derive DRIVERVERSION from DEFAULT_VERSION (single source of truth)
DRIVERVERSION="${DRIVER}-${DEFAULT_VERSION#v}"

# Allow override via -v option
if [ -n "$HELMCHARTVERSION" ]; then
DRIVERVERSION=$HELMCHARTVERSION
fi
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.33" "1.35"
verify_openshift_versions "4.18" "4.20"
verify_k8s_versions "1.34" "1.36"
verify_openshift_versions "4.18" "4.21"
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 | 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/')
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]+')
kNonGAVersion=$(run_command kubectl version | grep 'Server Version' | sed -n 's/.*\(-[alpha|beta][^ ]*\).*/\1/p')

while getopts ":h-:" optchar; do
Expand Down
42 changes: 21 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
module github.com/dell/csi-unity

go 1.25.0
go 1.26

require (
bou.ke/monkey v1.0.2
github.com/dell/dell-csi-extensions/podmon v1.10.0
github.com/dell/gobrick v1.16.0
github.com/dell/gocsi v1.16.0
github.com/dell/gofsutil v1.21.0
github.com/dell/goiscsi v1.14.0
github.com/dell/gounity v1.23.0
github.com/container-storage-interface/spec v1.6.0
github.com/dell/dell-csi-extensions/podmon v1.11.0
github.com/dell/gobrick v1.17.0
github.com/dell/gocsi v1.17.0
github.com/dell/gofsutil v1.22.0
github.com/dell/goiscsi v1.15.0
github.com/dell/gounity v1.24.0
github.com/container-storage-interface/spec v1.11.0
github.com/cucumber/godog v0.15.0
github.com/fsnotify/fsnotify v1.9.0
github.com/fsnotify/fsnotify v1.10.1
github.com/kubernetes-csi/csi-lib-utils v0.11.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/viper v1.21.0
github.com/stretchr/testify v1.11.1
golang.org/x/net v0.48.0
google.golang.org/grpc v1.78.0
google.golang.org/protobuf v1.36.10
google.golang.org/grpc v1.81.0
google.golang.org/protobuf v1.36.11
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/apimachinery v0.34.1
k8s.io/client-go v0.34.1
)

require (
github.com/dell/gonvme v1.13.0 // indirect
github.com/dell/gonvme v1.14.0 // indirect
github.com/akutz/gosync v0.1.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
Expand Down Expand Up @@ -68,15 +67,16 @@ require (
go.uber.org/zap v1.27.1 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.46.0 // indirect
golang.org/x/oauth2 v0.33.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.39.0 // indirect
golang.org/x/term v0.38.0 // indirect
golang.org/x/text v0.32.0 // indirect
golang.org/x/crypto v0.51.0 // indirect
golang.org/x/net v0.54.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.44.0 // indirect
golang.org/x/term v0.43.0 // indirect
golang.org/x/text v0.37.0 // indirect
golang.org/x/time v0.14.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/api v0.34.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
Expand Down
Loading
Loading