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 @@
# some arguments that must be supplied
ARG GOIMAGE
ARG BASEIMAGE
ARG VERSION="2.16.0"
ARG VERSION="2.17.0"

# Stage to build the driver
FROM $GOIMAGE as builder
Expand All @@ -38,7 +38,7 @@ LABEL vendor="Dell Technologies" \
name="csi-isilon" \
summary="CSI Driver for Dell EMC PowerScale" \
description="CSI Driver for provisioning persistent storage from Dell EMC PowerScale" \
release="1.16.0" \
release="1.17.0" \
version=$VERSION \
license="Apache-2.0"

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ gosec:
gosec -quiet -log gosec.log -out=gosecresults.csv -fmt=csv ./...

go-code-tester:
git clone --depth 1 git@github.com:CSM/actions.git temp-repo
git clone --depth 1 git@github.com:dell/actions.git temp-repo
cp temp-repo/go-code-tester/entrypoint.sh ./go-code-tester
chmod +x go-code-tester
rm -rf temp-repo
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 -- test-only: re-invoking test binary, not user input
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 @@ -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 within the driver repo at `https://github.com/dell/helm-charts/raw/csi-isilon-2.16.0/charts/csi-isilon/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 within the driver repo at `https://github.com/dell/helm-charts/raw/csi-isilon-2.17.0/charts/csi-isilon/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 PowerScale driver the following steps can be executed
Expand All @@ -46,7 +46,7 @@ For example, to create a values file for the PowerScale driver the following ste
cd dell-csi-helm-installer

# copy the template file
wget -O my-isilon-settings.yaml -b csi-isilon-2.16.0 https://raw.githubusercontent.com/dell/helm-charts/main/charts/csi-isilon/values.yaml
wget -O my-isilon-settings.yaml -b csi-isilon-2.17.0 https://raw.githubusercontent.com/dell/helm-charts/main/charts/csi-isilon/values.yaml

# edit the newly created values file
vi my-isilon-settings.yaml
Expand Down
15 changes: 9 additions & 6 deletions dell-csi-helm-installer/csi-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@

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

HELM_BRANCH="csi-isilon-2.16.0"
DRIVERDIR="${SCRIPTDIR}/../helm-charts/charts"
DRIVER="csi-isilon"
VERIFYSCRIPT="${SCRIPTDIR}/verify.sh"
PROG="${0}"
NODE_VERIFY=1
VERIFY=1
MODE="install"
DEFAULT_DRIVER_VERSION="v2.16.0"
DEFAULT_VERSION="v2.17.0"
WATCHLIST=""

# export the name of the debug log, so child processes will see it
Expand Down Expand Up @@ -373,15 +372,19 @@ done


DRIVERDIR="${SCRIPTDIR}/../"

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

# Allow override via --helm-charts-version
if [ -n "$HELMCHARTVERSION" ]; then
HELM_BRANCH=$HELMCHARTVERSION
DRIVERVERSION=$HELMCHARTVERSION
fi


if [ ! -d "$DRIVERDIR/helm-charts" ]; then

if [ ! -d "$SCRIPTDIR/helm-charts" ]; then
git clone --quiet -c advice.detachedHead=false -b $HELM_BRANCH https://github.com/dell/helm-charts
git clone --quiet -c advice.detachedHead=false -b $DRIVERVERSION https://github.com/dell/helm-charts
fi
mv helm-charts $DRIVERDIR
else
Expand All @@ -397,7 +400,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 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 @@ -88,30 +88,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
quay.io/dell/container-storage-modules/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-isilon:v2.17.0
...

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

Loaded image: quay.io/dell/container-storage-modules/csi-powerstore:v2.9.0
Loaded image: quay.io/dell/container-storage-modules/csi-isilon:v2.9.0
...
Loaded image: quay.io/dell/container-storage-modules/csi-isilon: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.9.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.9.0
quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.6.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.6.0
quay.io/dell/container-storage-modules/csi-isilon:v2.17.0 -> localregistry:5000/dell-csm-operator/csi-isilon: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.9.0 -> localregistry:5000/dell-csm-operator/csi-isilon:v2.9.0
changing: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.6.0 -> localregistry:5000/dell-csm-operator/csi-metadata-retriever:v1.6.0
...
changing: quay.io/dell/container-storage-modules/csi-isilon:v2.17.0 -> localregistry:5000/dell-csm-operator/csi-isilon: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
6 changes: 4 additions & 2 deletions dell-csi-helm-installer/csi-offline-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,12 @@ CREATE="false"
PREPARE="false"
REGISTRY=""
DRIVER="csi-isilon"
DEFAULT_VERSION="v2.17.0"

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

DRIVERVERSION="csi-isilon-2.16.0"

while getopts "cpr:v:h" opt; do
case $opt in
c)
Expand Down Expand Up @@ -262,7 +261,10 @@ while getopts "cpr:v: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-isilon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#
# verify-csi-isilon method
function verify-csi-isilon() {
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
63 changes: 31 additions & 32 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,40 +1,38 @@
module github.com/dell/csi-powerscale/v2

go 1.25.0
go 1.26

require (
github.com/dell/csi-metadata-retriever v1.13.0
github.com/dell/csmlog v1.0.0
github.com/dell/dell-csi-extensions/common v1.10.0
github.com/dell/dell-csi-extensions/podmon v1.10.0
github.com/dell/dell-csi-extensions/replication v1.13.0
github.com/dell/dell-csi-extensions/volumeGroupSnapshot v1.8.1
github.com/dell/gocsi v1.16.0
github.com/dell/gofsutil v1.21.0
github.com/dell/gopowerscale v1.21.0
github.com/dell/csi-metadata-retriever v1.14.0
github.com/dell/csmlog v1.1.0
github.com/dell/dell-csi-extensions/common v1.11.0
github.com/dell/dell-csi-extensions/podmon v1.11.0
github.com/dell/dell-csi-extensions/replication v1.14.0
github.com/dell/gocsi v1.17.0
github.com/dell/gofsutil v1.22.0
github.com/dell/gopowerscale v1.22.0
github.com/Showmax/go-fqdn v1.0.0
github.com/akutz/gosync v0.1.0
github.com/container-storage-interface/spec v1.6.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/golang/mock v1.6.0
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1
github.com/kubernetes-csi/csi-lib-utils v0.11.0
github.com/sirupsen/logrus v1.9.3
github.com/sirupsen/logrus v1.9.4
github.com/spf13/viper v1.21.0
github.com/stretchr/testify v1.11.1
golang.org/x/net v0.49.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.v3 v3.0.1
k8s.io/api v0.34.2
k8s.io/apimachinery v0.34.2
k8s.io/client-go v0.34.2
k8s.io/api v0.35.4
k8s.io/apimachinery v0.35.4
k8s.io/client-go v0.35.4
)

require (
github.com/PuerkitoBio/goquery v1.11.0 // indirect
github.com/PuerkitoBio/goquery v1.12.0 // indirect
github.com/andybalholm/cascadia v1.3.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
Expand Down Expand Up @@ -93,27 +91,28 @@ require (
go.etcd.io/etcd/client/pkg/v3 v3.6.6 // indirect
go.etcd.io/etcd/client/v3 v3.6.6 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
go.opentelemetry.io/otel v1.38.0 // indirect
go.opentelemetry.io/otel/trace v1.38.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
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/oauth2 v0.33.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/term v0.39.0 // indirect
golang.org/x/text v0.33.0 // indirect
golang.org/x/net v0.53.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sys v0.43.0 // indirect
golang.org/x/term v0.42.0 // indirect
golang.org/x/text v0.36.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/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/component-base v0.34.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Loading