diff --git a/README.md b/README.md index 47d13fd..c64c038 100644 --- a/README.md +++ b/README.md @@ -42,11 +42,13 @@ Predominantly 3 things are needed: - deploy the driver into the cluster (`helm` chart provided with sample `values.yaml`) -## Guides +## Community Guides - https://jonathangazeley.com/2021/01/05/using-truenas-to-provide-persistent-storage-for-kubernetes/ - https://gist.github.com/admun/4372899f20421a947b7544e5fc9f9117 (migrating from `nfs-client-provisioner` to `democratic-csi`) +- https://gist.github.com/deefdragon/d58a4210622ff64088bd62a5d8a4e8cc + (migrating between storage classes using `velero`) ## Node Prep diff --git a/examples/freenas-iscsi.yaml b/examples/freenas-iscsi.yaml index 15413b5..1e67356 100644 --- a/examples/freenas-iscsi.yaml +++ b/examples/freenas-iscsi.yaml @@ -60,8 +60,9 @@ zfs: # 512, 1K, 2K, 4K, 8K, 16K, 64K, 128K default is 16K zvolBlocksize: iscsi: - targetPortal: "server:3261" - targetPortals: [] + targetPortal: "server[:port]" + # for multipath + targetPortals: [] # [ "server[:port]", "server[:port]", ... ] # leave empty to omit usage of -I with iscsiadm interface: diff --git a/examples/zfs-generic-iscsi.yaml b/examples/zfs-generic-iscsi.yaml index e529ff2..7e0d13f 100644 --- a/examples/zfs-generic-iscsi.yaml +++ b/examples/zfs-generic-iscsi.yaml @@ -73,8 +73,10 @@ iscsi: # mutual CHAP #mutual_userid: "baz" #mutual_password: "bar" - targetPortal: "server address" - targetPortals: [] + targetPortal: "server[:port]" + # for multipath + targetPortals: [] # [ "server[:port]", "server[:port]", ... ] + # leave empty to omit usage of -I with iscsiadm interface: "" # MUST ensure uniqueness diff --git a/src/driver/controller-zfs-generic/index.js b/src/driver/controller-zfs-generic/index.js index 71173cf..09d0c7b 100644 --- a/src/driver/controller-zfs-generic/index.js +++ b/src/driver/controller-zfs-generic/index.js @@ -169,7 +169,9 @@ create /backstores/block/${iscsiName} volume_context = { node_attach_driver: "iscsi", portal: this.options.iscsi.targetPortal, - portals: this.options.iscsi.targetPortals.join(","), + portals: this.options.iscsi.targetPortals + ? this.options.iscsi.targetPortals.join(",") + : "", interface: this.options.iscsi.interface, iqn: iqn, lun: 0, diff --git a/src/driver/freenas/index.js b/src/driver/freenas/index.js index e53721d..e9987bc 100644 --- a/src/driver/freenas/index.js +++ b/src/driver/freenas/index.js @@ -1232,27 +1232,13 @@ class FreeNASDriver extends ControllerZfsSshBaseDriver { [FREENAS_ISCSI_ASSETS_NAME_PROPERTY_NAME]: iscsiName, }); - // iscsiadm -m discovery -t st -p 172.21.26.81 - // iscsiadm -m node -T iqn.2011-03.lan.bitness.istgt:test -p bitness.lan -l - - // FROM driver config? no, node attachment should have everything required to remain independent - // portal - // portals - // interface - // chap discovery - // chap session - - // FROM context - // iqn - // lun - volume_context = { node_attach_driver: "iscsi", portal: this.options.iscsi.targetPortal, - portals: this.options.iscsi.targetPortals.join(","), + portals: this.options.iscsi.targetPortals + ? this.options.iscsi.targetPortals.join(",") + : "", interface: this.options.iscsi.interface || "", - //chapDiscoveryEnabled: this.options.iscsi.chapDiscoveryEnabled, - //chapSessionEnabled: this.options.iscsi.chapSessionEnabled, iqn: iqn, lun: 0, };