diff --git a/dell-csi-helm-installer/csi-install.sh b/dell-csi-helm-installer/csi-install.sh index bea1ccf0..ec98d435 100755 --- a/dell-csi-helm-installer/csi-install.sh +++ b/dell-csi-helm-installer/csi-install.sh @@ -12,103 +12,8 @@ # limitations under the License SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" -DRIVERDIR="${SCRIPTDIR}/../" - -DRIVERVERSION="csi-isilon-2.8.0" -while getopts ":h-:" optchar; do - case "${optchar}" in - -) - case "${OPTARG}" in - skip-verify) - VERIFY=0 - ;; - skip-verify-node) - NODE_VERIFY=0 - ;; - upgrade) - MODE="upgrade" - ;; - # NAMESPACE - version) - DRIVER_VERSION="${!OPTIND}" - OPTIND=$((OPTIND + 1)) - ;; - # DRIVER IMAGE VERSION - namespace) - NS="${!OPTIND}" - if [[ -z ${NS} || ${NS} == "--skip-verify" ]]; then - NS=${DEFAULT_NS} - else - OPTIND=$((OPTIND + 1)) - fi - ;; - namespace=*) - NS=${OPTARG#*=} - if [[ -z ${NS} ]]; then NS=${DEFAULT_NS}; fi - ;; - # RELEASE - release) - RELEASE="${!OPTIND}" - OPTIND=$((OPTIND + 1)) - ;; - release=*) - RELEASE=${OPTARG#*=} - ;; - # helm chart version - helm-charts-version) - HELMCHARTVERSION="${!OPTIND}" - OPTIND=$((OPTIND + 1)) - ;; - # VALUES - values) - VALUES="${!OPTIND}" - OPTIND=$((OPTIND + 1)) - ;; - values=*) - VALUES=${OPTARG#*=} - ;; - # NODEUSER - node-verify-user) - NODEUSER="${!OPTIND}" - OPTIND=$((OPTIND + 1)) - ;; - node-verify-user=*) - HODEUSER=${OPTARG#*=} - ;; - *) - decho "Unknown option --${OPTARG}" - decho "For help, run $PROG -h" - exit 1 - ;; - esac - ;; - h) - usage - ;; - *) - decho "Unknown option -${OPTARG}" - decho "For help, run $PROG -h" - exit 1 - ;; - esac -done - -if [ -n "$HELMCHARTVERSION" ]; then - DRIVERVERSION=$HELMCHARTVERSION -fi - -if [ ! -d "$DRIVERDIR/helm-charts" ]; then - - if [ ! -d "$SCRIPTDIR/helm-charts" ]; then - git clone --quiet -c advice.detachedHead=false -b $DRIVERVERSION https://github.com/dell/helm-charts - fi - mv helm-charts $DRIVERDIR -else - if [ -d "$SCRIPTDIR/helm-charts" ]; then - rm -rf $SCRIPTDIR/helm-charts - fi -fi +HELM_BRANCH="csi-isilon-2.8.0" DRIVERDIR="${SCRIPTDIR}/../helm-charts/charts" DRIVER="csi-isilon" VERIFYSCRIPT="${SCRIPTDIR}/verify.sh" @@ -388,9 +293,104 @@ function verify_kubernetes() { VERIFYOPTS="" ASSUMEYES="false" -DRIVERDIR="${SCRIPTDIR}/../helm-charts/charts" +while getopts ":h-:" optchar; do + case "${optchar}" in + -) + case "${OPTARG}" in + skip-verify) + VERIFY=0 + ;; + skip-verify-node) + NODE_VERIFY=0 + ;; + upgrade) + MODE="upgrade" + ;; + # NAMESPACE + version) + DRIVER_VERSION="${!OPTIND}" + OPTIND=$((OPTIND + 1)) + ;; + # DRIVER IMAGE VERSION + namespace) + NS="${!OPTIND}" + if [[ -z ${NS} || ${NS} == "--skip-verify" ]]; then + NS=${DEFAULT_NS} + else + OPTIND=$((OPTIND + 1)) + fi + ;; + namespace=*) + NS=${OPTARG#*=} + if [[ -z ${NS} ]]; then NS=${DEFAULT_NS}; fi + ;; + # RELEASE + release) + RELEASE="${!OPTIND}" + OPTIND=$((OPTIND + 1)) + ;; + release=*) + RELEASE=${OPTARG#*=} + ;; + # helm chart version + helm-charts-version) + HELMCHARTVERSION="${!OPTIND}" + OPTIND=$((OPTIND + 1)) + ;; + # VALUES + values) + VALUES="${!OPTIND}" + OPTIND=$((OPTIND + 1)) + ;; + values=*) + VALUES=${OPTARG#*=} + ;; + # NODEUSER + node-verify-user) + NODEUSER="${!OPTIND}" + OPTIND=$((OPTIND + 1)) + ;; + node-verify-user=*) + HODEUSER=${OPTARG#*=} + ;; + *) + decho "Unknown option --${OPTARG}" + decho "For help, run $PROG -h" + exit 1 + ;; + esac + ;; + h) + usage + ;; + *) + decho "Unknown option -${OPTARG}" + decho "For help, run $PROG -h" + exit 1 + ;; + esac +done +DRIVERDIR="${SCRIPTDIR}/../" +if [ -n "$HELMCHARTVERSION" ]; then + HELM_BRANCH=$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 + fi + mv helm-charts $DRIVERDIR +else + if [ -d "$SCRIPTDIR/helm-charts" ]; then + rm -rf $SCRIPTDIR/helm-charts + fi +fi + +DRIVERDIR="${SCRIPTDIR}/../helm-charts/charts" # by default the NAME of the helm release of the driver is the same as the driver name RELEASE=$(get_release_name "${DRIVER}") diff --git a/go.mod b/go.mod index 608e66e6..c001beab 100644 --- a/go.mod +++ b/go.mod @@ -9,10 +9,10 @@ require ( github.com/container-storage-interface/spec v1.5.0 github.com/cucumber/godog v0.10.0 github.com/dell/csi-metadata-retriever v1.4.0 - github.com/dell/dell-csi-extensions/common v1.1.2 - github.com/dell/dell-csi-extensions/podmon v1.1.3 - github.com/dell/dell-csi-extensions/replication v1.4.0 - github.com/dell/dell-csi-extensions/volumeGroupSnapshot v1.2.3 + github.com/dell/dell-csi-extensions/common v1.1.3-0.20230821201344-ea25f89d957e + github.com/dell/dell-csi-extensions/podmon v1.1.4-0.20230821201344-ea25f89d957e + github.com/dell/dell-csi-extensions/replication v1.4.1-0.20230821201344-ea25f89d957e + github.com/dell/dell-csi-extensions/volumeGroupSnapshot v1.2.4-0.20230821201344-ea25f89d957e github.com/dell/gocsi v1.7.0 github.com/dell/gofsutil v1.12.0 github.com/dell/goisilon v1.12.1-0.20230822111217-6db00ba5c496 @@ -92,10 +92,10 @@ require ( golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 552de2ac..aa71d9a6 100644 --- a/go.sum +++ b/go.sum @@ -119,14 +119,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dell/csi-metadata-retriever v1.4.0 h1:5pzeburIxYIzXNd446mTROdJeMvi7wNPsUlknxHAH4I= github.com/dell/csi-metadata-retriever v1.4.0/go.mod h1:cPGxyyOoHkpIKjMOtQwqrle49/Q7o63eZ+bUq/6+nzY= -github.com/dell/dell-csi-extensions/common v1.1.2 h1:0N9OpbrM6KR6JJnJJLUp40AZFpxDtxPCuAf+vbis7/4= -github.com/dell/dell-csi-extensions/common v1.1.2/go.mod h1:gN1UI4Wag3JXtqHQwkM4O6p0V+2WvesangManDOH9a8= -github.com/dell/dell-csi-extensions/podmon v1.1.3 h1:fpv5CaiBSfd2SQDHGEzpTUYncRjWUlrPnrH5OHT0gAs= -github.com/dell/dell-csi-extensions/podmon v1.1.3/go.mod h1:eZQK/0uQp7VIAHDQIHIqDtvjgIKXaWFIKcW8eTUhQ98= -github.com/dell/dell-csi-extensions/replication v1.4.0 h1:YCNyJ0ixwQHG1AxqoJ5OHJ0nRWOQ0QyV6/Nps6VwMV4= -github.com/dell/dell-csi-extensions/replication v1.4.0/go.mod h1:eJXKPU+qgE0XnOnjYoBMBBFwgomPVvW4kd6C8a43i3A= -github.com/dell/dell-csi-extensions/volumeGroupSnapshot v1.2.3 h1:4rR5Y/GGGmEKRHCIsBbBySFzZRgl+ZFRIIuFqYTh+0k= -github.com/dell/dell-csi-extensions/volumeGroupSnapshot v1.2.3/go.mod h1:e+mpeEK5tc2n2indRbG27V00QoNoZBCzqcloOXx75lA= +github.com/dell/dell-csi-extensions/common v1.1.3-0.20230821201344-ea25f89d957e h1:uaxwRJE62QvACLF/zqHU8NaXMGtCYWTTd8DzVuOcbiE= +github.com/dell/dell-csi-extensions/common v1.1.3-0.20230821201344-ea25f89d957e/go.mod h1:RLDVq6tz2yVzsX804Daopj/JBB147uqH2NKx6O3G0vA= +github.com/dell/dell-csi-extensions/podmon v1.1.4-0.20230821201344-ea25f89d957e h1:2Ctt6HbPkoa296Q4DXyFV3zmnzsLuh7QKDV0Dge+rxw= +github.com/dell/dell-csi-extensions/podmon v1.1.4-0.20230821201344-ea25f89d957e/go.mod h1:MXkd5u3Vt876LEqDeqywlK0Re/IA0FZlHKFWvvdhyzI= +github.com/dell/dell-csi-extensions/replication v1.4.1-0.20230821201344-ea25f89d957e h1:48wwLgv0qO1lVFQAgpKoEaHFeTT7GJtXczD3PPbQSrY= +github.com/dell/dell-csi-extensions/replication v1.4.1-0.20230821201344-ea25f89d957e/go.mod h1:puNHmHJWoWeMNj5NXER7oXZtxVnkWZjFNP8mwK0ev18= +github.com/dell/dell-csi-extensions/volumeGroupSnapshot v1.2.4-0.20230821201344-ea25f89d957e h1:rR7GBqRmCB1kdJM0PcrgI+yMJJjeFIJjCOLmT5fQsgE= +github.com/dell/dell-csi-extensions/volumeGroupSnapshot v1.2.4-0.20230821201344-ea25f89d957e/go.mod h1:EWT6KIoauXYlcGiss60KwlnTwxFI6KCt3hklW0HZIOc= github.com/dell/gocsi v1.7.0 h1:fMQO2zwAXCaIsUoPCcnnuPMwfQMoaI1/0aqkQVndlxU= github.com/dell/gocsi v1.7.0/go.mod h1:X/8Ll8qqKAKCenmd1gPJMUvUmgY8cK0LiS8Pck12UaU= github.com/dell/gofsutil v1.12.0 h1:oo2YHfGFKHvHS1urtqjOIKpaHwcdyqacwKHLXzUg33M= @@ -889,12 +889,12 @@ google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M= -google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= -google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ= -google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= +google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= +google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= +google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e h1:z3vDksarJxsAKM5dmEGv0GHwE2hKJ096wZra71Vs4sw= +google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 h1:lv6/DhyiFFGsmzxbsUUTOkN29II+zeWHxvT8Lpdxsv0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -929,8 +929,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=