From fbbe94424083e17f6a991a2f05e13066f313b1e1 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 7 Sep 2022 17:24:55 +0200
Subject: [PATCH] feat: switch root volumes to gp3, add eudev, ...

---
 alpine-cloud-images/clouds/aws.py          |   2 +-
 cleanup_amis.sh                            |   4 ++--
 overlay/zdt/configs/access.conf.age        | Bin 602 -> 0 bytes
 overlay/zdt/configs/common-packages.conf   |  17 ++++++++++-------
 overlay/zdt/configs/common-services.conf   |   1 +
 overlay/zdt/configs/common.conf            |   4 ++--
 overlay/zdt/configs/kubezero-packages.conf |   0
 overlay/zdt/configs/kubezero.conf          |   4 +++-
 overlay/zdt/configs/minimal.conf           |   4 ++++
 9 files changed, 23 insertions(+), 13 deletions(-)
 delete mode 100644 overlay/zdt/configs/access.conf.age
 create mode 100644 overlay/zdt/configs/kubezero-packages.conf

diff --git a/alpine-cloud-images/clouds/aws.py b/alpine-cloud-images/clouds/aws.py
index 68728fa..d40f3d8 100644
--- a/alpine-cloud-images/clouds/aws.py
+++ b/alpine-cloud-images/clouds/aws.py
@@ -192,7 +192,7 @@ class AWSCloudAdapter(CloudAdapterInterface):
                 Architecture=self.ARCH[ic.arch],
                 BlockDeviceMappings=[{
                     'DeviceName': '/dev/xvda',
-                    'Ebs': {'SnapshotId': snapshot_id}
+                    'Ebs': {'SnapshotId': snapshot_id, 'VolumeType': 'gp3'}
                 }],
                 Description=description,
                 EnaSupport=True,
diff --git a/cleanup_amis.sh b/cleanup_amis.sh
index 672befd..d889d20 100755
--- a/cleanup_amis.sh
+++ b/cleanup_amis.sh
@@ -5,8 +5,8 @@ echo "Are you really sure as AMIs might be used by customers !!"
 read
 
 #TAG_FILTER="Name=tag:project,Values=zdt-alpine"
-TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-minimal-r1"
-#TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-kubezero-1.23.10-r0"
+#TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.0-x86_64-bios-tiny-minimal-r0"
+TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-kubezero-1.23.10-r1"
 
 #for r in $(aws ec2 describe-regions --query "Regions[].{Name:RegionName}" --output text); do
 for r in ap-southeast-2 ca-central-1 eu-central-1 us-east-1 us-west-1 us-west-2; do
diff --git a/overlay/zdt/configs/access.conf.age b/overlay/zdt/configs/access.conf.age
deleted file mode 100644
index 2598b05f0ef17742c3a7f1532ceddc5ff0f72120..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 602
zcmV-g0;T<7XJsvAZewzJaCB*JZZ2<fXD@a!3N1b$STZ#=F*zVqc1U(^a$#6@R4Y+M
zGH)+3Pi$vUSZh`?WMgYtO;&I=Rz);ncrt7_cQgudP-!w#QFt;qHF9ZdS7>5+LRM8{
zIdo!SbTLPEXf%0oHbhxuYiL?#ZAA(#EiE8ubvQ9>W@UGGPf21!OiF80Qbb})XmxpH
zP-JOQaZz<OZ$>awW=vv6PB;p%K#bmd?yl_ZRau*lw)84zQzUH(jMtQ<;;I?cQ=@?1
z-E=;1i?Iq1=I|V1FI?DeEre=EJy}4k@<C|>x$;2ikM1o7;v>GXftzZ|6t4@e*8bG2
zkJHub7r<zOVixR8@aB;UQq1PiF(uM4rOOW%%<pz%hU5uQY0S-u{WN7XHH>*v>B+?I
zD>D@Qz`x>qCtKEV222hP8W-~cMv{H06*IAtG^N~e{a4c{Xp>|c>*H4Clk;w*-z*Su
zBK=+jd+*XYT}^FWa)kErZ^HKm%7K3}N5gK|*8npDiyi|}=$}E(iv&bU$yxf`gly||
zxpA(WWAfi_0-@{tL2L6j(WL*duG0-ftXc4~JqyPSsA!7)PGvWFjc43)yTcytdQUQi
zJFIjF0gW7B=jXHS4PTFD<-gsTbkhih>@l_CA3BS`6%|Jte)g$Mii{CX5i*zA42EaW
zKlA-zV6^%Rix(E{tw^E?Bus>^+iz4dK$`e_I8vIR{8Dsv$E~{Fs@-b#_coKFc%J>t
omMj<@So}{%6+mN}dS?J<I5G5v6r#S;qzq7wniUT6)%TijsrEw@mH+?%

diff --git a/overlay/zdt/configs/common-packages.conf b/overlay/zdt/configs/common-packages.conf
index e97146e..14b1323 100644
--- a/overlay/zdt/configs/common-packages.conf
+++ b/overlay/zdt/configs/common-packages.conf
@@ -1,4 +1,5 @@
 bash            = true
+eudev           = true
 jq              = true
 yq              = true
 logrotate       = true
@@ -13,10 +14,12 @@ nvme-cli        = true
 xfsprogs        = true
 dhclient        = true
 monit           = true
-tiny-cloud	  		 	= main-edge
-tiny-cloud-openrc		= main-edge
-tiny-cloud-network	= main-edge
-tiny-cloud-aws			= main-edge
-conmon							= community-edge
-prometheus-node-exporter				= true
-prometheus-wireguard-exporter		= true
+busybox-extras  = true
+tcpdump         = true
+tiny-cloud          = edge-main
+tiny-cloud-openrc   = edge-main
+tiny-cloud-network  = edge-main
+tiny-cloud-aws      = edge-main
+conmon              = edge-community
+prometheus-node-exporter       = true
+prometheus-wireguard-exporter  = true
diff --git a/overlay/zdt/configs/common-services.conf b/overlay/zdt/configs/common-services.conf
index 039c859..2e5bc23 100644
--- a/overlay/zdt/configs/common-services.conf
+++ b/overlay/zdt/configs/common-services.conf
@@ -1,5 +1,6 @@
 sysinit {
   cgroups = true
+  udev = true
 }
 
 boot {
diff --git a/overlay/zdt/configs/common.conf b/overlay/zdt/configs/common.conf
index 2315a42..c07581e 100644
--- a/overlay/zdt/configs/common.conf
+++ b/overlay/zdt/configs/common.conf
@@ -5,8 +5,8 @@ packages { include required("common-packages.conf") }
 services { include required("common-services.conf") }
 
 repos {
-  "https://dl-cdn.alpinelinux.org/alpine/edge/main" = main-edge
-  "https://dl-cdn.alpinelinux.org/alpine/edge/community" = community-edge
+  "https://dl-cdn.alpinelinux.org/alpine/edge/main" = edge-main
+  "https://dl-cdn.alpinelinux.org/alpine/edge/community" = edge-community
 }
 
 WHEN {
diff --git a/overlay/zdt/configs/kubezero-packages.conf b/overlay/zdt/configs/kubezero-packages.conf
new file mode 100644
index 0000000..e69de29
diff --git a/overlay/zdt/configs/kubezero.conf b/overlay/zdt/configs/kubezero.conf
index 3b06187..f3d5e56 100644
--- a/overlay/zdt/configs/kubezero.conf
+++ b/overlay/zdt/configs/kubezero.conf
@@ -2,9 +2,11 @@
 
 include required("common.conf")
 
+packages { include required("kubezero-packages.conf") }
+
 description = [ "- https://kubezero.com" ]
 name = [ kubezero-1.23.10 ]
-size = 2G
+# size = 2G
 
 WHEN {
   kubezero {
diff --git a/overlay/zdt/configs/minimal.conf b/overlay/zdt/configs/minimal.conf
index 105ee9b..b7f7c87 100644
--- a/overlay/zdt/configs/minimal.conf
+++ b/overlay/zdt/configs/minimal.conf
@@ -4,3 +4,7 @@ include required("common.conf")
 
 description = [ "- https://zero-downtime.net/cloud" ]
 name = [ minimal ]
+
+#kernel_options {
+#  "lsm=landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor" = true
+#}