From 51fd7742edec8a204154caa5f37d7b65359b034b Mon Sep 17 00:00:00 2001
From: Kelly Shutt <10223024+CompPhy@users.noreply.github.com>
Date: Wed, 31 Jan 2024 02:34:48 -0500
Subject: [PATCH] netboot.xyz - Fixes for #2101 and #2104 (#2102)

---
 library/ix-dev/community/netbootxyz/Chart.yaml             | 2 +-
 library/ix-dev/community/netbootxyz/metadata.yaml          | 2 ++
 library/ix-dev/community/netbootxyz/templates/_netboot.tpl | 1 +
 library/ix-dev/community/netbootxyz/upgrade_strategy       | 4 ++--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/ix-dev/community/netbootxyz/Chart.yaml b/library/ix-dev/community/netbootxyz/Chart.yaml
index aec38bd43f..2ed9473d6c 100644
--- a/library/ix-dev/community/netbootxyz/Chart.yaml
+++ b/library/ix-dev/community/netbootxyz/Chart.yaml
@@ -3,7 +3,7 @@ description: netboot.xyz lets you PXE boot various operating system installers o
 annotations:
   title: netbootxyz
 type: application
-version: 1.0.0
+version: 1.0.1
 apiVersion: v2
 appVersion: 2.0.76
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/community/netbootxyz/metadata.yaml b/library/ix-dev/community/netbootxyz/metadata.yaml
index 9006156fd3..ebda0a685a 100644
--- a/library/ix-dev/community/netbootxyz/metadata.yaml
+++ b/library/ix-dev/community/netbootxyz/metadata.yaml
@@ -15,6 +15,8 @@ capabilities:
     description: TFTP requires this ability to switch user for sub-processes.
   - name: SETGID
     description: TFTP requires this ability to switch group for sub-processes.
+  - name: SYS_CHROOT
+    description: TFTP requires this ability to spawn child processes.
   - name: NET_BIND_SERVICE
     description: TFTP requires this ability to bind to port 69 for TFTP.
   - name: KILL
diff --git a/library/ix-dev/community/netbootxyz/templates/_netboot.tpl b/library/ix-dev/community/netbootxyz/templates/_netboot.tpl
index d1ef92f474..657dc2e9d6 100644
--- a/library/ix-dev/community/netbootxyz/templates/_netboot.tpl
+++ b/library/ix-dev/community/netbootxyz/templates/_netboot.tpl
@@ -23,6 +23,7 @@ workload:
                 - FOWNER
                 - SETGID
                 - SETUID
+                - SYS_CHROOT
                 - NET_BIND_SERVICE
                 - KILL
           env:
diff --git a/library/ix-dev/community/netbootxyz/upgrade_strategy b/library/ix-dev/community/netbootxyz/upgrade_strategy
index e7c7ee22f8..0997aa78a1 100644
--- a/library/ix-dev/community/netbootxyz/upgrade_strategy
+++ b/library/ix-dev/community/netbootxyz/upgrade_strategy
@@ -6,12 +6,12 @@ import sys
 from catalog_update.upgrade_strategy import semantic_versioning
 
 
-RE_STABLE_VERSION = re.compile(r'\d+\.\d+\.\d+-nbxyz2')
+RE_STABLE_VERSION = re.compile(r'\d+\.\d+\.\d+-nbxyz\d')
 
 
 def newer_mapping(image_tags):
     key = list(image_tags.keys())[0]
-    tags = {t.strip('-nbxyz2'): t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)}
+    tags = {t.replace("-nbxyz", "."): t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)}
     version = semantic_versioning(list(tags))
     if not version:
         return {}