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

support setting extentComment for freenas-api-iscsi and freenas-iscsi 

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen 2022-03-01 13:12:45 -07:00
parent d275eccfa4
commit c54abd405f
4 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/freenas-api-iscsi.yaml
View File

@ -63,6 +63,9 @@ iscsi:
#nameTemplate: "{{ parameters.[csi.storage.k8s.io/pvc/namespace] }}-{{ parameters.[csi.storage.k8s.io/pvc/name] }}"
namePrefix: csi-
nameSuffix: "-clustera"
#extentCommentTemplate: "{{ parameters.[csi.storage.k8s.io/pvc/namespace] }}-{{ parameters.[csi.storage.k8s.io/pvc/name] }}"
# add as many as needed
targetGroups:
# get the correct ID from the "portal" section in the UI

3
examples/freenas-iscsi.yaml
View File

@ -72,6 +72,9 @@ iscsi:
#nameTemplate: "{{ parameters.[csi.storage.k8s.io/pvc/namespace] }}-{{ parameters.[csi.storage.k8s.io/pvc/name] }}"
namePrefix: csi-
nameSuffix: "-clustera"
#extentCommentTemplate: "{{ parameters.[csi.storage.k8s.io/pvc/namespace] }}-{{ parameters.[csi.storage.k8s.io/pvc/name] }}"
# add as many as needed
targetGroups:
# get the correct ID from the "portal" section in the UI

23
src/driver/freenas/api.js
View File

@ -640,6 +640,25 @@ class FreeNASApiDriver extends CsiBaseDriver {
"FreeNAS creating iscsi assets with name: " + iscsiName
);
let extentComment;
if (this.options.iscsi.extentCommentTemplate) {
extentComment = Handlebars.compile(
this.options.iscsi.extentCommentTemplate
)({
name: call.request.name,
parameters: call.request.parameters,
csi: {
name: this.ctx.args.csiName,
version: this.ctx.args.csiVersion,
},
zfs: {
datasetName: datasetName,
},
});
} else {
extentComment = "";
}
const extentInsecureTpc = this.options.iscsi.hasOwnProperty(
"extentInsecureTpc"
)
@ -863,7 +882,7 @@ class FreeNASApiDriver extends CsiBaseDriver {
}
let extent = {
iscsi_target_extent_comment: "", // TODO: allow template for this value
iscsi_target_extent_comment: extentComment,
iscsi_target_extent_type: "Disk", // Disk/File, after save Disk becomes "ZVOL"
iscsi_target_extent_name: iscsiName,
iscsi_target_extent_insecure_tpc: extentInsecureTpc,
@ -1114,7 +1133,7 @@ class FreeNASApiDriver extends CsiBaseDriver {
});
let extent = {
comment: "", // TODO: allow this to be templated
comment: extentComment,
type: "DISK", // Disk/File, after save Disk becomes "ZVOL"
name: iscsiName,
//iscsi_target_extent_naa: "0x3822690834aae6c5",

23
src/driver/freenas/ssh.js
View File

@ -671,6 +671,25 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
"FreeNAS creating iscsi assets with name: " + iscsiName
);
let extentComment;
if (this.options.iscsi.extentCommentTemplate) {
extentComment = Handlebars.compile(
this.options.iscsi.extentCommentTemplate
)({
name: call.request.name,
parameters: call.request.parameters,
csi: {
name: this.ctx.args.csiName,
version: this.ctx.args.csiVersion,
},
zfs: {
datasetName: datasetName,
},
});
} else {
extentComment = "";
}
const extentInsecureTpc = this.options.iscsi.hasOwnProperty(
"extentInsecureTpc"
)
@ -894,7 +913,7 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
}
let extent = {
iscsi_target_extent_comment: "", // TODO: allow template for this value
iscsi_target_extent_comment: extentComment,
iscsi_target_extent_type: "Disk", // Disk/File, after save Disk becomes "ZVOL"
iscsi_target_extent_name: iscsiName,
iscsi_target_extent_insecure_tpc: extentInsecureTpc,
@ -1145,7 +1164,7 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
});
let extent = {
comment: "", // TODO: allow this to be templated
comment: extentComment,
type: "DISK", // Disk/File, after save Disk becomes "ZVOL"
name: iscsiName,
//iscsi_target_extent_naa: "0x3822690834aae6c5",