public_git
/
democratic-csi
mirror of https://github.com/democratic-csi/democratic-csi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove ssh references, remove unavailable options from sample file 

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen 2022-02-03 01:44:27 -07:00
parent 259eaec6bc
commit edf3916c71
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/zfs-local-dataset.yaml
View File

@ -9,6 +9,3 @@ zfs:
datasetEnableQuotas: true datasetEnableQuotas: true
datasetEnableReservation: false datasetEnableReservation: false
datasetPermissionsMode: "0777"
datasetPermissionsUser: 0
datasetPermissionsGroup: 0

24
src/driver/controller-zfs/index.js
View File

@ -29,7 +29,7 @@ const VOLUME_CONTEXT_PROVISIONER_INSTANCE_ID_PROPERTY_NAME =
"democratic-csi:volume_context_provisioner_instance_id"; "democratic-csi:volume_context_provisioner_instance_id";
/** /**
* Base driver to provisin zfs assets over ssh. * Base driver to provisin zfs assets using zfs cli commands.
* Derived drivers only need to implement: * Derived drivers only need to implement:
* - getExecClient() * - getExecClient()
* - async getZetabyte() * - async getZetabyte()
@ -468,35 +468,35 @@ class ControllerZfsBaseDriver extends CsiBaseDriver {
* limit the actual checks semi sanely * limit the actual checks semi sanely
* health checks should kick in an restart the pod * health checks should kick in an restart the pod
* this process is 2 checks in 1 * this process is 2 checks in 1
* - ensure basic ssh connectivity * - ensure basic exec connectivity
* - ensure csh is not the operative shell * - ensure csh is not the operative shell
*/ */
if (!driver.currentSSHShell || timerEnabled === false) { if (!driver.currentExecShell || timerEnabled === false) {
const execClient = this.getExecClient(); const execClient = this.getExecClient();
driver.ctx.logger.debug("performing ssh sanity check.."); driver.ctx.logger.debug("performing exec sanity check..");
const response = await execClient.exec("echo $0"); const response = await execClient.exec("echo $0");
driver.currentSSHShell = response.stdout.split("\n")[0]; driver.currentExecShell = response.stdout.split("\n")[0];
} }
// update in the background every X interval to prevent incessant checks // update in the background every X interval to prevent incessant checks
if (timerEnabled && !driver.currentSSHShellInterval) { if (timerEnabled && !driver.currentExecShellInterval) {
const intervalTime = 60000; const intervalTime = 60000;
driver.currentSSHShellInterval = setInterval(async () => { driver.currentExecShellInterval = setInterval(async () => {
try { try {
driver.ctx.logger.debug("performing ssh sanity check.."); driver.ctx.logger.debug("performing exec sanity check..");
const execClient = this.getExecClient(); const execClient = this.getExecClient();
const response = await execClient.exec("echo $0"); const response = await execClient.exec("echo $0");
driver.currentSSHShell = response.stdout.split("\n")[0]; driver.currentExecShell = response.stdout.split("\n")[0];
} catch (e) { } catch (e) {
delete driver.currentSSHShell; delete driver.currentExecShell;
} }
}, intervalTime); }, intervalTime);
} }
if (driver.currentSSHShell.includes("csh")) { if (driver.currentExecShell.includes("csh")) {
throw new GrpcError( throw new GrpcError(
grpc.status.FAILED_PRECONDITION, grpc.status.FAILED_PRECONDITION,
`csh is an unsupported shell, please update the default shell of your ssh user` `csh is an unsupported shell, please update the default shell of your exec user`
); );
} }