From fc9a5b3eae1775f50e6d36c1740ae6eebe6b497c Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 14 Jun 2024 12:58:48 +0000
Subject: [PATCH] Wrap up 1.28

---
 cleanup_amis.sh                           |   2 +-
 overlay/zdt/configs/access.conf.age       | Bin 602 -> 0 bytes
 overlay/zdt/configs/edition/kubezero.conf |   4 ++--
 scan_image.sh                             |   4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 overlay/zdt/configs/access.conf.age

diff --git a/cleanup_amis.sh b/cleanup_amis.sh
index f74c347..b03ff62 100755
--- a/cleanup_amis.sh
+++ b/cleanup_amis.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # set -x
 
-TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.18*dev*" #-dev" #kubezero*"
+TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.18*" #-dev" #kubezero*"
 #TAG_FILTER="Name=tag:Name,Values=zdt-alpine-*kubezero*1.28*"
 
 echo "Are you really sure to delete AMIs matching \"$TAG_FILTER\" ?"
diff --git a/overlay/zdt/configs/access.conf.age b/overlay/zdt/configs/access.conf.age
deleted file mode 100644
index 0b310c374326be5f498d570a86786ece61deeaf1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 602
zcmV-g0;T<7XJsvAZewzJaCB*JZZ2<fXD@a!3N1b$STZ#=F*zV^D_AdVQ+F^ldO=rG
zH&R(~bT345O;$lrW_V*aD>+3tK|@z#Wm9KEZfgo=Z$U{bO>A*xQ#og8R&sMhVpD8P
za#~emPeV0RQFU)vNh?TYIBsY+Z8QokEiE8zYE(2?H8eDLN=i0HSXoa_XL2|-O<HPn
zZ8LgvO=K}iM@()pQfg{5H**RgKQg8a3F|1^2lC?+No>$hPMZO`W3cEYOKKHk1)dk;
zl~=dM^~GB&3S-E(1nmhxD(Ku|aLvr3(K^rrI^-#2Z{n!yIeez&%J0$XY!|RN;~L{J
zpG%8G?i0?5rbxOX35#s}>*puCpQg*c;|S7cQ6Xk7)I#;n68rUN<FqO<_BMd+M5q;B
ztTH|mkSGBzNUc@&>zjCZ)F-DUGXj)PN9?_vRIU=%LUrO>7C0q^>i5If+Io>3K^r4x
zanV9=ul>`|oDL#R$yR#XGA`jIPxG2ZW&7pJDXzO7Air=;MVEj0E9+QFWzK#bRJX~A
zJp5N=C^Iqi5iM2sY0CbT(GN8Q7hjfxaJL}iE*+fep%KM~wvM~zU>fR`D9g8mr-Q>+
zkWZj~`QQ=`URw_oKbU+C2w-Pvu0apvkAg;$Wn$>%<n9|}S1;V~{=pQ2PRH(Fi5Z{7
zRlHWXT|)P{%mu>TRt;}(I3M&OjJD`edOxWN+hb31z9{p;%_hz&>MG2Q-Rd!870(!y
oZ;KZ0P2xr8)Zf&|9&Hh30E!L<t=pEQMkJETdv*8gn&f8pIQ`@e^8f$<

diff --git a/overlay/zdt/configs/edition/kubezero.conf b/overlay/zdt/configs/edition/kubezero.conf
index 1d808bf..0b28a93 100644
--- a/overlay/zdt/configs/edition/kubezero.conf
+++ b/overlay/zdt/configs/edition/kubezero.conf
@@ -1,6 +1,6 @@
 # vim: ts=2 et:
 
-kubezero-version = "1.28.8"
+kubezero-version = "1.28.9"
 
 include required("common.conf")
 
@@ -15,7 +15,7 @@ services { include required("kubezero-services.conf") }
 WHEN {
   aws {
     packages {
-      #aws-neuron-driver = kubezero
+      aws-neuron-driver = kubezero
       nvidia-open-gpu   = kubezero
     }
   }
diff --git a/scan_image.sh b/scan_image.sh
index 5baf088..1c97c3d 100755
--- a/scan_image.sh
+++ b/scan_image.sh
@@ -5,7 +5,7 @@ IMAGE=$1
 
 modprobe nbd
 qemu-nbd -c /dev/nbd0 --read-only $IMAGE
-mount /dev/nbd0p2 /mnt/temp/
-trivy rootfs /mnt/temp
+mount -o ro /dev/nbd0p2 /mnt/temp/
+trivy rootfs -d /mnt/temp
 umount /mnt/temp
 qemu-nbd -d /dev/nbd0