From 95562bd11a2b605b80ac727330e7373fa0d6526d Mon Sep 17 00:00:00 2001
From: Andrei Kvapil <kvapss@gmail.com>
Date: Wed, 15 May 2024 10:16:35 +0200
Subject: [PATCH] Filters virtual interfaces and disks in the list

---
 charts/talm/templates/_helpers.tpl | 4 +++-
 pkg/generated/presets.go           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/talm/templates/_helpers.tpl b/charts/talm/templates/_helpers.tpl
index 86d928d..a2e9fec 100644
--- a/charts/talm/templates/_helpers.tpl
+++ b/charts/talm/templates/_helpers.tpl
@@ -19,6 +19,7 @@
 {{- define "talm.discovered.disks_info" }}
 # -- Discovered disks:
 {{- range .Disks }}
+{{- if not (regexMatch "^/dev/(zd)" .device_name) }}
 # {{ .device_name }}:
 #    model: {{ .model }}
 #    serial: {{ .serial }}
@@ -26,6 +27,7 @@
 #    size: {{ include "talm.human_size" .size }}
 {{- end }}
 {{- end }}
+{{- end }}
 
 {{- define "talm.human_size" }}
   {{- $bytes := int64 . }}
@@ -65,7 +67,7 @@
 {{- define "talm.discovered.physical_links_info" }}
 # -- Discovered interfaces:
 {{- range (lookup "links" "" "").items }}
-{{- if regexMatch "^(eno|eth|enp|enx|ens)" .metadata.id }}
+{{- if and .spec.busPath (regexMatch "^(eno|eth|enp|enx|ens)" .metadata.id) }}
 # enx{{ .spec.hardwareAddr | replace ":" "" }}:
 #   id: {{ .metadata.id }}
 #   hardwareAddr:{{ .spec.hardwareAddr }}
diff --git a/pkg/generated/presets.go b/pkg/generated/presets.go
index fed24c0..9d638be 100644
--- a/pkg/generated/presets.go
+++ b/pkg/generated/presets.go
@@ -233,6 +233,7 @@ description: A library Talm chart for Talos Linux
 {{- define "talm.discovered.disks_info" }}
 # -- Discovered disks:
 {{- range .Disks }}
+{{- if not (regexMatch "^/dev/(zd)" .device_name) }}
 # {{ .device_name }}:
 #    model: {{ .model }}
 #    serial: {{ .serial }}
@@ -240,6 +241,7 @@ description: A library Talm chart for Talos Linux
 #    size: {{ include "talm.human_size" .size }}
 {{- end }}
 {{- end }}
+{{- end }}
 
 {{- define "talm.human_size" }}
   {{- $bytes := int64 . }}
@@ -279,7 +281,7 @@ description: A library Talm chart for Talos Linux
 {{- define "talm.discovered.physical_links_info" }}
 # -- Discovered interfaces:
 {{- range (lookup "links" "" "").items }}
-{{- if regexMatch "^(eno|eth|enp|enx|ens)" .metadata.id }}
+{{- if and .spec.busPath (regexMatch "^(eno|eth|enp|enx|ens)" .metadata.id) }}
 # enx{{ .spec.hardwareAddr | replace ":" "" }}:
 #   id: {{ .metadata.id }}
 #   hardwareAddr:{{ .spec.hardwareAddr }}