feat: rework iscsi-tools

* `tgtd` is only needed if exposing `iSCSI` targets from the host, not needed when using as a client. * Use `/system/etc` as writable homedir for open-iscsi * Drop `isns` since we never ran `isns` daemon We could also split the `iscsid-wrapper` into two services, will do after what comes out of siderolabs/talos#10009. Signed-off-by: Noel Georgi <[email protected]>
siderolabs · Jan 5, 2025 · bb09cc8 · bb09cc8
1 parent db466d1
commit bb09cc8
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 175 deletions.
diff --git a/storage/iscsi-tools/iscsid-wrapper/main.go b/storage/iscsi-tools/iscsid-wrapper/main.go
@@ -23,18 +23,19 @@ func main() {
 
 	cmd.Stdout = &cmdOut
 
-	if _, err := os.Stat("/etc/iscsi/initiatorname.iscsi"); err != nil {
+	if _, err := os.Stat("/system/etc/iscsi/initiatorname.iscsi"); err != nil {
 		if errors.Is(err, os.ErrNotExist) {
-			log.Println("iscsid-wrapper: /etc/iscsi/initiatorname.iscsi does not exist, creating")
+			log.Println("iscsid-wrapper: /system/etc/iscsi/initiatorname.iscsi does not exist, creating")
+
 			if err := cmd.Run(); err != nil {
-				log.Printf("iscsi-iname: error generating iscsi initiatorname %v\n", err)
+				log.Fatalf("iscsi-iname: error generating iscsi initiatorname %v\n", err)
 			}
 
 			initiatorName := fmt.Sprintf("InitiatorName=%s", cmdOut.String())
-			log.Printf("iscsid-wrapper: writing %s to /etc/iscsi/initiatorname.iscsi", initiatorName)
+			log.Printf("iscsid-wrapper: writing %s to /system/etc/iscsi/initiatorname.iscsi", initiatorName)
 
-			if err := os.WriteFile("/etc/iscsi/initiatorname.iscsi", []byte(initiatorName), 0o644); err != nil {
-				log.Printf("iscsi-iname: error saving iscsi initiatorname %v\n", err)
+			if err := os.WriteFile("/system/etc/iscsi/initiatorname.iscsi", []byte(initiatorName), 0o644); err != nil {
+				log.Fatalf("iscsi-iname: error saving iscsi initiatorname %v\n", err)
 			}
 		}
 	}

diff --git a/storage/iscsi-tools/iscsid.yaml b/storage/iscsi-tools/iscsid.yaml
@@ -1,7 +1,6 @@
 name: iscsid
 depends:
   - service: cri
-  - service: ext-tgtd
   - network:
        - addresses
        - connectivity
@@ -42,25 +41,13 @@ container:
         - bind
         - ro
     # persistent storage for iscsi
-    - source: /system/iscsi
-      destination: /etc/iscsi
+    - source: /system/etc/iscsi
+      destination: /system/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
       type: bind

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=/system/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
@@ -63,10 +62,9 @@ steps:
 
         # 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
+        rm -rf /rootfs/system
+        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,12 @@ 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 +21,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,4 +1,4 @@
-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