support csi.access_modes, dep bumps
Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
parent
9a9ea36e7b
commit
4132fdb607
|
|
@ -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
|
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
|
||||||
|
|
||||||
ENV LANG=en_US.utf8
|
ENV LANG=en_US.utf8
|
||||||
ENV NODE_VERSION=v16.16.0
|
ENV NODE_VERSION=v16.18.0
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
|
|
||||||
# install build deps
|
# install build deps
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ RUN @( \
|
||||||
gpg --keyserver hkps://keys.openpgp.org --recv-keys $_ ; \
|
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 ;
|
||||||
#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 ; \
|
||||||
|
|
|
||||||
|
|
@ -275,6 +275,8 @@ following known issues:
|
||||||
Ensure the following services are configurged and running:
|
Ensure the following services are configurged and running:
|
||||||
|
|
||||||
- ssh (if you use a password for authentication make sure it is allowed)
|
- 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
|
- ensure `zsh`, `bash`, or `sh` is set as the root shell, `csh` gives false errors due to quoting
|
||||||
- nfs
|
- nfs
|
||||||
- iscsi
|
- iscsi
|
||||||
|
|
@ -473,7 +475,7 @@ following:
|
||||||
- For `iscsi` and `smb` be aware that the names of assets/shares are _global_
|
- 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
|
and so collisions are possible/probable. Appropriate use of the respective
|
||||||
`nameTemplate`, `namePrefix`, and `nameSuffix` configuration options will
|
`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
|
# Snapshot Support
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,8 @@ node:
|
||||||
customOptions: []
|
customOptions: []
|
||||||
#- -E
|
#- -E
|
||||||
#- nodiscard
|
#- nodiscard
|
||||||
|
#- m
|
||||||
|
#- 0
|
||||||
# ...
|
# ...
|
||||||
btrfs:
|
btrfs:
|
||||||
customOptions: []
|
customOptions: []
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "democratic-csi",
|
"name": "democratic-csi",
|
||||||
"version": "1.7.6",
|
"version": "1.7.7",
|
||||||
"description": "kubernetes csi driver framework",
|
"description": "kubernetes csi driver framework",
|
||||||
"main": "bin/democratic-csi",
|
"main": "bin/democratic-csi",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
@ -21,8 +21,8 @@
|
||||||
"@grpc/grpc-js": "^1.5.7",
|
"@grpc/grpc-js": "^1.5.7",
|
||||||
"@grpc/proto-loader": "^0.7.0",
|
"@grpc/proto-loader": "^0.7.0",
|
||||||
"@kubernetes/client-node": "^0.17.0",
|
"@kubernetes/client-node": "^0.17.0",
|
||||||
"async-mutex": "^0.3.1",
|
"async-mutex": "^0.4.0",
|
||||||
"axios": "^0.27.2",
|
"axios": "^1.1.3",
|
||||||
"bunyan": "^1.8.15",
|
"bunyan": "^1.8.15",
|
||||||
"fs-extra": "^10.1.0",
|
"fs-extra": "^10.1.0",
|
||||||
"handlebars": "^4.7.7",
|
"handlebars": "^4.7.7",
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
"semver": "^7.3.4",
|
"semver": "^7.3.4",
|
||||||
"ssh2": "^1.1.0",
|
"ssh2": "^1.1.0",
|
||||||
"uri-js": "^4.4.1",
|
"uri-js": "^4.4.1",
|
||||||
"uuid": "^8.3.2",
|
"uuid": "^9.0.0",
|
||||||
"winston": "^3.6.0",
|
"winston": "^3.6.0",
|
||||||
"yargs": "^17.0.1"
|
"yargs": "^17.0.1"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -110,11 +110,12 @@ class ControllerZfsLocalDriver extends ControllerZfsBaseDriver {
|
||||||
* @returns Array
|
* @returns Array
|
||||||
*/
|
*/
|
||||||
getAccessModes() {
|
getAccessModes() {
|
||||||
const driverZfsResourceType = this.getDriverZfsResourceType();
|
|
||||||
let access_modes = _.get(this.options, "csi.access_modes", null);
|
let access_modes = _.get(this.options, "csi.access_modes", null);
|
||||||
if (access_modes !== null) {
|
if (access_modes !== null) {
|
||||||
return access_modes;
|
return access_modes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const driverZfsResourceType = this.getDriverZfsResourceType();
|
||||||
switch (driverZfsResourceType) {
|
switch (driverZfsResourceType) {
|
||||||
case "filesystem":
|
case "filesystem":
|
||||||
return [
|
return [
|
||||||
|
|
|
||||||
|
|
@ -208,6 +208,11 @@ class ControllerZfsBaseDriver extends CsiBaseDriver {
|
||||||
}
|
}
|
||||||
|
|
||||||
getAccessModes() {
|
getAccessModes() {
|
||||||
|
let access_modes = _.get(this.options, "csi.access_modes", null);
|
||||||
|
if (access_modes !== null) {
|
||||||
|
return access_modes;
|
||||||
|
}
|
||||||
|
|
||||||
const driverZfsResourceType = this.getDriverZfsResourceType();
|
const driverZfsResourceType = this.getDriverZfsResourceType();
|
||||||
switch (driverZfsResourceType) {
|
switch (driverZfsResourceType) {
|
||||||
case "filesystem":
|
case "filesystem":
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue