Merge pull request #240 from democratic-csi/next

support csi.access_modes, dep bumps

Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/*
         && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
 ENV LANG=en_US.utf8
-ENV NODE_VERSION=v16.16.0
+ENV NODE_VERSION=v16.18.0
 ENV NODE_ENV=production
 
 # install build deps

Dockerfile.Windows

@@ -57,7 +57,7 @@ RUN @( \
       gpg --keyserver hkps://keys.openpgp.org --recv-keys $_ ; \
     }
 
-ENV NODE_VERSION 16.16.0
+ENV NODE_VERSION 16.18.0
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ;
 #RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \

README.md

@@ -275,6 +275,8 @@ following known issues:
 Ensure the following services are configurged and running:
 
 - ssh (if you use a password for authentication make sure it is allowed)
+  - https://www.truenas.com/community/threads/ssh-access-ssh-rsa-not-in-pubkeyacceptedalgorithms.101715/
+  - `PubkeyAcceptedAlgorithms +ssh-rsa`
 - ensure `zsh`, `bash`, or `sh` is set as the root shell, `csh` gives false errors due to quoting
 - nfs
 - iscsi
@@ -473,7 +475,7 @@ following:
 - For `iscsi` and `smb` be aware that the names of assets/shares are _global_
   and so collisions are possible/probable. Appropriate use of the respective
   `nameTemplate`, `namePrefix`, and `nameSuffix` configuration options will
-  mitigate the issue (#210).
+  mitigate the issue [#210](https://github.com/democratic-csi/democratic-csi/issues/210).
 
 # Snapshot Support
 

examples/node-common.yaml

@@ -27,6 +27,8 @@ node:
       customOptions: []
       #- -E
       #- nodiscard
+      #- m
+      #- 0
       # ...
     btrfs:
       customOptions: []

package.json

@@ -1,6 +1,6 @@
 {
   "name": "democratic-csi",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "kubernetes csi driver framework",
   "main": "bin/democratic-csi",
   "scripts": {
@@ -21,8 +21,8 @@
     "@grpc/grpc-js": "^1.5.7",
     "@grpc/proto-loader": "^0.7.0",
     "@kubernetes/client-node": "^0.17.0",
-    "async-mutex": "^0.3.1",
-    "axios": "^0.27.2",
+    "async-mutex": "^0.4.0",
+    "axios": "^1.1.3",
     "bunyan": "^1.8.15",
     "fs-extra": "^10.1.0",
     "handlebars": "^4.7.7",
@@ -33,7 +33,7 @@
     "semver": "^7.3.4",
     "ssh2": "^1.1.0",
     "uri-js": "^4.4.1",
-    "uuid": "^8.3.2",
+    "uuid": "^9.0.0",
     "winston": "^3.6.0",
     "yargs": "^17.0.1"
   },

src/driver/controller-zfs-local/index.js

@@ -110,11 +110,12 @@ class ControllerZfsLocalDriver extends ControllerZfsBaseDriver {
    * @returns Array
    */
   getAccessModes() {
-    const driverZfsResourceType = this.getDriverZfsResourceType();
     let access_modes = _.get(this.options, "csi.access_modes", null);
     if (access_modes !== null) {
       return access_modes;
     }
+
+    const driverZfsResourceType = this.getDriverZfsResourceType();
     switch (driverZfsResourceType) {
       case "filesystem":
         return [

src/driver/controller-zfs/index.js

@@ -208,6 +208,11 @@ class ControllerZfsBaseDriver extends CsiBaseDriver {
   }
 
   getAccessModes() {
+    let access_modes = _.get(this.options, "csi.access_modes", null);
+    if (access_modes !== null) {
+      return access_modes;
+    }
+
     const driverZfsResourceType = this.getDriverZfsResourceType();
     switch (driverZfsResourceType) {
       case "filesystem":