feat: rework iscsi-tools

* `tgtd` is only needed if exposing `iSCSI` targets from the host, not needed when using as a client. * Drop `isns` since we never ran `isns` daemon * Drop `iscsid-wrapper` since Talos now manages `iqn`, ref: siderolabs/talos#10162 Signed-off-by: Noel Georgi <[email protected]>
siderolabs · Jan 20, 2025 · 4a2e536 · 4a2e536
1 parent ec5e273
commit 4a2e536
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 252 deletions.
diff --git a/go.work b/go.work
@@ -4,5 +4,4 @@ use (
 	./examples/hello-world-service/src
 	./nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime-wrapper
 	./nvidia-gpu/nvidia-container-toolkit/nvidia-persistenced-wrapper
-	./storage/iscsi-tools/iscsid-wrapper
 )
diff --git a/storage/iscsi-tools/iscsid-wrapper/go.mod b/storage/iscsi-tools/iscsid-wrapper/go.mod
diff --git a/storage/iscsi-tools/iscsid-wrapper/go.sum b/storage/iscsi-tools/iscsid-wrapper/go.sum
diff --git a/storage/iscsi-tools/iscsid-wrapper/main.go b/storage/iscsi-tools/iscsid-wrapper/main.go
diff --git a/storage/iscsi-tools/iscsid-wrapper/pkg.yaml b/storage/iscsi-tools/iscsid-wrapper/pkg.yaml
diff --git a/storage/iscsi-tools/iscsid.yaml b/storage/iscsi-tools/iscsid.yaml
@@ -1,14 +1,16 @@
 name: iscsid
 depends:
   - service: cri
-  - service: ext-tgtd
   - network:
        - addresses
        - connectivity
        - hostname
        - etcfiles
+  - path: /etc/iscsi/initiatorname.iscsi
 container:
-  entrypoint: /usr/local/sbin/iscsid-wrapper
+  entrypoint: /usr/local/sbin/iscsid
+  args:
+    - -f
   security:
     maskedPaths: []
     readonlyPaths: []
@@ -41,25 +43,13 @@ container:
       options:
         - bind
         - ro
-    # persistent storage for iscsi
-    - source: /system/iscsi
+    # iscsi etc folder
+    - source: /etc/iscsi
       destination: /etc/iscsi
       type: bind
       options:
         - rshared
         - rbind
-        - rw
-    - source: /usr/local/etc/iscsi/iscsid.conf
-      destination: /etc/iscsi/iscsid.conf
-      type: bind
-      options:
-        - bind
-        - ro
-    - source: /usr/local/etc/passwd
-      destination: /etc/passwd
-      type: bind
-      options:
-        - bind
         - ro
     - source: /var/lib/iscsi
       destination: /var/lib/iscsi

diff --git a/storage/iscsi-tools/open-iscsi/files/passwd b/storage/iscsi-tools/open-iscsi/files/passwd
diff --git a/storage/iscsi-tools/open-iscsi/pkg.yaml b/storage/iscsi-tools/open-iscsi/pkg.yaml
@@ -6,8 +6,6 @@ dependencies:
   - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kmod:{{ .BUILD_ARG_PKGS }}"
   - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}"
   - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS }}"
-  - stage: open-isns
-    from: /rootfs
 steps:
   - sources:
       - url: https://github.com/open-iscsi/open-iscsi/archive/refs/tags/{{ .OPEN_ISCSI_VERSION }}.tar.gz
@@ -49,10 +47,11 @@ steps:
         meson setup \
           -Db_lto=true \
           -Dno_systemd=true \
+          -Disns=disabled \
+          -Dhomedir=/etc/iscsi \
           -Dprefix=/usr/local \
           -Discsi_sbindir=/usr/local/sbin \
           -Drulesdir=/usr/lib/udev/rules.d \
-          -Dc_args="$CFLAGS -I/usr/local/include -DNO_SYSTEMD -DGLOB_ONLYDIR=0" \
           output
 
         ninja -C output
@@ -62,11 +61,10 @@ steps:
         DESTDIR=/rootfs ninja -C output install
 
         # cleanup
-        # we generate a one time initiatorname.iscsi when the iscsid-wrapper starts.
-        rm -rf /rootfs/usr/local/{etc/iscsi/initiatorname.iscsi,share,include,pkgconfig}
-        rm -rf /rootfs/var/lib/iscsi
-
-        cp /pkg/files/passwd /rootfs/usr/local/etc/passwd
+        # we generate initiatorname.iscsi on talos side.
+        rm -rf /rootfs/etc
+        rm -rf /rootfs/usr/local/{etc,share,include,pkgconfig}
+        rm -rf /rootfs/var
 finalize:
   - from: /rootfs
     to: /rootfs
diff --git a/storage/iscsi-tools/open-isns/pkg.yaml b/storage/iscsi-tools/open-isns/pkg.yaml
diff --git a/storage/iscsi-tools/pkg.yaml b/storage/iscsi-tools/pkg.yaml
@@ -5,14 +5,11 @@ dependencies:
   # `base` dependency is used for doing cleanups
   # not copied to rootfs
   - stage: base
-  - stage: open-isns
   - stage: open-iscsi
-  - stage: tgt
-  - stage: iscsid-wrapper
 steps:
   - install:
     - |
-      mkdir -p /rootfs/usr/local/lib/containers/{iscsid,tgtd}
+      mkdir -p /rootfs/usr/local/lib/containers/iscsid
 
       sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml
 
@@ -23,7 +20,6 @@ steps:
       mkdir -p /rootfs/usr/local/etc/containers
 
       cp /pkg/iscsid.yaml /rootfs/usr/local/etc/containers/iscsid.yaml
-      cp /pkg/tgtd.yaml /rootfs/usr/local/etc/containers/tgtd.yaml
     test:
       - |
         mkdir -p /extensions-validator-rootfs

diff --git a/storage/iscsi-tools/tgt/musl.patch b/storage/iscsi-tools/tgt/musl.patch
diff --git a/storage/iscsi-tools/tgt/pkg.yaml b/storage/iscsi-tools/tgt/pkg.yaml
diff --git a/storage/iscsi-tools/tgtd.yaml b/storage/iscsi-tools/tgtd.yaml
diff --git a/storage/iscsi-tools/vars.yaml b/storage/iscsi-tools/vars.yaml
@@ -1,5 +1,3 @@
-VERSION: v0.1.6
+VERSION: v0.2.0
 # renovate: datasource=github-tags depName=open-iscsi/open-iscsi
 OPEN_ISCSI_VERSION: 2.1.10
-# renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=open-iscsi/open-isns
-OPEN_ISNS_VERSION: 0.103