From b03c948f4d3f6b6e9952262212b72852b279dc84 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 4 Nov 2022 15:10:49 +0100
Subject: [PATCH] Pull latest alpine-cloud-iamges, first metal tests

---
 Makefile                                        |   5 ++++-
 overlay/zdt/configs/access.conf.age             | Bin 602 -> 602 bytes
 .../configs/{ => edition}/common-packages.conf  |   0
 .../configs/{ => edition}/common-services.conf  |   0
 overlay/zdt/configs/{ => edition}/common.conf   |   0
 .../{ => edition}/kubezero-packages.conf        |   0
 overlay/zdt/configs/{ => edition}/kubezero.conf |   0
 overlay/zdt/configs/{ => edition}/minimal.conf  |   0
 overlay/zdt/configs/machine/metal.conf          |  14 ++++++++++++++
 overlay/zdt/configs/machine/vm.conf             |   4 ++++
 overlay/zdt/configs/zdt.conf                    |  10 +++++++---
 11 files changed, 29 insertions(+), 4 deletions(-)
 rename overlay/zdt/configs/{ => edition}/common-packages.conf (100%)
 rename overlay/zdt/configs/{ => edition}/common-services.conf (100%)
 rename overlay/zdt/configs/{ => edition}/common.conf (100%)
 rename overlay/zdt/configs/{ => edition}/kubezero-packages.conf (100%)
 rename overlay/zdt/configs/{ => edition}/kubezero.conf (100%)
 rename overlay/zdt/configs/{ => edition}/minimal.conf (100%)
 create mode 100644 overlay/zdt/configs/machine/metal.conf
 create mode 100644 overlay/zdt/configs/machine/vm.conf

diff --git a/Makefile b/Makefile
index b963629..e47780c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ STEP := publish
 all: build
 
 build:
-	cd alpine-cloud-images && ./build $(STEP) --clean --revise $(FILTER) --custom $(OVERLAY)/zdt --vars $(OVERLAY)/zdt/zdt.hcl
+	cd alpine-cloud-images && ./build $(STEP) --clean --no-pad-uefi-bins --revise $(FILTER) --custom $(OVERLAY)/zdt --vars $(OVERLAY)/zdt/zdt.hcl
 
 clean:
 	rm -rf alpine-cloud-images/work
@@ -38,3 +38,6 @@ scan-image:
 	qemu-nbd -c /dev/nbd0 --read-only alpine-cloud-images/work/images/aws/3.15.4-x86_64-bios-cloudinit-aws-kubezero/image.qcow2
 	mount /dev/nbd0 /mnt/temp/
 	trivy rootfs /mnt/temp
+
+pull-upstream: ## pull latest shared alpine-cloud-images
+	git stash && git subtree pull --prefix alpine-cloud-images git@gitlab.alpinelinux.org:alpine/cloud/alpine-cloud-images.git main --squash && git stash pop
diff --git a/overlay/zdt/configs/access.conf.age b/overlay/zdt/configs/access.conf.age
index e7591ef320436ae823f4d441deed484e81efe4cd..680b234b7d2ca9c6ea6bad0bb4828dd32251512a 100644
GIT binary patch
delta 581
zcmV-L0=oU$1lk0UAb&7$Mn!K^FLre@OF2hTa%pyNN=s8{Hgi-}Y%gt1PiZ(dHbXHr
zZ8$?kI0{r^cuYrCM@cwnO)qU~H(EAYb6R3WW-~!BWo=<scw%UCH+MxdVRBPhSqd#J
zEg)t@L^NeJPA^1bNoP?pRZJ^-L}O1!R%A0~VQXVkRZ%ljH-A)ONi<|NdSeQUAYq*A
zNi`B)EP(+z)L+J-oxYh#?o@y+yPVYFk;S2C1CG!-EA*M`7((w8#<>PMNdD}(1M>}x
zp)U>|l+k9Vvd<I$5?-Y*MeS~8j`(@~ZS6bHjGrr!JHD?$0Yr@d5rxgs0KVW7D`uBy
z&YCmOOva0E3xDQNei1SuwLqL9U*?DZ(vHI67Jk<>Y-G<kMPO8Tjd1x$@2g+9fF|7S
zax`vN?pJb7oFxyY)>DiUr4qZJp$x>PXMq?nWPn~k2=Zv!F<_-dEu@w=s*L2m*K7zw
z5{$0XP{%H?D(kU0o-3!+T$0(Wi;7USAoxg(yC&A{wttt|cnOF3B@GZXmda0?@ik?f
z=MlUY8#v#m@y<Qzazxv60DB$jV+ej>xyZ%DRU!e9K%{cVY?pw$mZ3fq)&D$&S*?HL
zR;G=Dp9xKN(=~c9F`{Smf<KxGC(;5R;os+hQI0dvX4n(4Q%nF}X7sUD3orOz`@(IW
zz<DJmojzZiT8zpiqz4EWF$M$*N*4ZcInl))>N()6E><?vg7g)gs0*`3D5`zIg-W=`
TOQxFBwBtGVyC&Oq@Ebd39l8TF

delta 581
zcmV-L0=oU$1lk0UAb&P^L^*a*V{K3|az}Q0Syg#>N-$MMGj~W*RZUW4HE=;`c42LA
zPk2UCNeX3eaz{sGOiMF!Gcsc<WO89EZF+WYR(M2EcT!1lVOUK=RZ1@_G(~G|K?*G`
zEg)!TXnJ^eaBFCCax`>sc`rFrV{AcaQ7}qHWn^+lT2*&hSbuj>Mn*M5cS#CO9WM(!
zU-#nr4uZx74SE?sw~Os;*`KtxfH=fY<-(LXp#4EwhN2}<FmBn@{Po$Jji@FI=~kGU
z$Z6dCme-PX`x-pWDCxyy@SqPSyxm7H42qO;{i<v}df8OV<(HGS#EOAPG){*o6re0p
zd(YEKi%H%Zy??6p;;!S_?~><;G|;3chvN1rf9V<<s&7LuEPtZa{FNZQzK*+Y$l$wz
z>8|u%9L>qMg2Ru`1x<yf`}|2gSc0i?98f9w*|mwB;5>&ve`f=%Qhq~b!~Ou%KXYRt
zXIrfnd0EMotQ*OduqY1c>=0Z7?*Jx~=&%WX2T5$D@qgGV0zBuuy1v#$XHYfm;pMxB
zj*<_)2VpTqtvYP!6-wXAK|Q=3aIv1So+?|R|3=?=hS5^dWr8#wgsH2d{PSe-ouXqR
z=$|T+fz@Yg6Xq!-4D&>l<c})4;XutYA?m7zM#dn4;)N6mZESHL=UK!1Qrd8nuyvmV
zskM9A1U{PVRH-O#FOzr@%UG!TEBNLx1qOV2Xhfs7Lq6V;?LEX~Lsy%nTUv#Al4s8b
T1&zo_6=$5%_UZzZN({6}3h5E7

diff --git a/overlay/zdt/configs/common-packages.conf b/overlay/zdt/configs/edition/common-packages.conf
similarity index 100%
rename from overlay/zdt/configs/common-packages.conf
rename to overlay/zdt/configs/edition/common-packages.conf
diff --git a/overlay/zdt/configs/common-services.conf b/overlay/zdt/configs/edition/common-services.conf
similarity index 100%
rename from overlay/zdt/configs/common-services.conf
rename to overlay/zdt/configs/edition/common-services.conf
diff --git a/overlay/zdt/configs/common.conf b/overlay/zdt/configs/edition/common.conf
similarity index 100%
rename from overlay/zdt/configs/common.conf
rename to overlay/zdt/configs/edition/common.conf
diff --git a/overlay/zdt/configs/kubezero-packages.conf b/overlay/zdt/configs/edition/kubezero-packages.conf
similarity index 100%
rename from overlay/zdt/configs/kubezero-packages.conf
rename to overlay/zdt/configs/edition/kubezero-packages.conf
diff --git a/overlay/zdt/configs/kubezero.conf b/overlay/zdt/configs/edition/kubezero.conf
similarity index 100%
rename from overlay/zdt/configs/kubezero.conf
rename to overlay/zdt/configs/edition/kubezero.conf
diff --git a/overlay/zdt/configs/minimal.conf b/overlay/zdt/configs/edition/minimal.conf
similarity index 100%
rename from overlay/zdt/configs/minimal.conf
rename to overlay/zdt/configs/edition/minimal.conf
diff --git a/overlay/zdt/configs/machine/metal.conf b/overlay/zdt/configs/machine/metal.conf
new file mode 100644
index 0000000..637f211
--- /dev/null
+++ b/overlay/zdt/configs/machine/metal.conf
@@ -0,0 +1,14 @@
+# bare metal
+
+name         = ["metal"]
+machine_name = "Bare Metal"
+
+# Kernel and firmware are 900M !
+size  = 2G
+
+EXCLUDE = ["aws"]
+
+packages.linux-virt = null
+packages.linux-lts  = true
+
+# TODO: other kernel_modules, kernel_options, or initfs_features?
diff --git a/overlay/zdt/configs/machine/vm.conf b/overlay/zdt/configs/machine/vm.conf
new file mode 100644
index 0000000..6f1690c
--- /dev/null
+++ b/overlay/zdt/configs/machine/vm.conf
@@ -0,0 +1,4 @@
+name           = [vm]      # we need a name to be able to skip
+machine_name    = "Virtual"
+
+# all image defaults are for virutal machines
diff --git a/overlay/zdt/configs/zdt.conf b/overlay/zdt/configs/zdt.conf
index d5ec723..c8392a1 100644
--- a/overlay/zdt/configs/zdt.conf
+++ b/overlay/zdt/configs/zdt.conf
@@ -45,6 +45,10 @@ Dimensions {
     #cloudinit { include required("bootstrap/cloudinit.conf") }
     tiny { include required("bootstrap/tiny.conf") }
   }
+  machine {
+    vm      { include required("machine/vm.conf") }
+    metal   { include required("machine/metal.conf") }
+  }
   cloud {
     aws { include required("cloud/aws.conf") }
     aws.regions {
@@ -57,9 +61,9 @@ Dimensions {
       us-west-2 = true
     }
   }
-  artifact {
-    minimal { include required("minimal.conf") }
-    kubezero { include required("kubezero.conf") }
+  edition {
+    minimal { include required("edition/minimal.conf") }
+    kubezero { include required("edition/kubezero.conf") }
   }
 }