From b907511e03f28c6aa7c5e1043604af6088f877b5 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Sun, 25 Sep 2022 14:37:21 +0200
Subject: [PATCH] feat: update Kubzero 1.23.11, new branding

---
 cleanup_amis.sh                           |   2 +-
 overlay/zdt/configs/access.conf.age       | Bin 602 -> 602 bytes
 overlay/zdt/configs/common-packages.conf  |   1 +
 overlay/zdt/configs/kubezero.conf         |   2 +-
 overlay/zdt/configs/zdt.conf              |   7 -----
 overlay/zdt/scripts/setup-common          |   6 ++++
 overlay/zdt/scripts/setup.d/neofetch.conf |  34 ++++++++++++++++++++++
 overlay/zdt/scripts/setup.d/zdt-ascii.txt |  21 +++++++++++++
 8 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 overlay/zdt/scripts/setup.d/neofetch.conf
 create mode 100644 overlay/zdt/scripts/setup.d/zdt-ascii.txt

diff --git a/cleanup_amis.sh b/cleanup_amis.sh
index d889d20..a7d3712 100755
--- a/cleanup_amis.sh
+++ b/cleanup_amis.sh
@@ -6,7 +6,7 @@ read
 
 #TAG_FILTER="Name=tag:project,Values=zdt-alpine"
 #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"
+TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-kubezero-1.23.10-r0"
 
 #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
index dcdbe72c60b7250439170c2d9d38c81ca38d4756..e7591ef320436ae823f4d441deed484e81efe4cd 100644
GIT binary patch
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

delta 581
zcmV-L0=oU$1lk0UAb(LwMq*V_HgrrjPg6`qMS5g6Vo@tfb4zh>K{QZtHAF9Ud0J3Y
zI5~1da|%sQa9UGWbTe;NOJOx?NLo-=ZFzMoXH8E=Y%zCFP+3(rNNzDPVnK6QMG7q~
zEg(=)cTqS;c2!SMT4FVFWm;=XHb-eMLv<@!Vl#4WWM*knL4PthRY`bfXH5!2c=81s
zQ;K~F@e&PE3A5{kkKfXU3tUj!v1IQ1qs+eIVv?l5AExScz!|9e#*^ZaZYCS~^Eb{D
z#ZlH`>?t1uZDrp=e`8r`p(*CeG?lo$Y_1YA5gIgaAwEb$zH#h{CGHn1RFaRYKdc6=
zYOiycYc&*6^M5&nL(>}URCNvAtZjj5mBTOWH}xab7Lx(Mt>+;iyqxlR`>vevt4+~w
z!TSysmdDTZ)sKb^VwQ07e)p`u6p{IFqIe_<Y*)2m0GZDTo?Lx*DH;&vG(c-?%n5M2
zc{Dps0zn-6fk#_GRZK4(@n#SM;O_mSNT5-PS5A=*bAP8=!miHE$lJny?lEtXxY-&P
zZCExmig%8sJulT+bia%FNwK}9jH7UMDn8jg&iY!Yl!v!sXx~_Jj$$5frr4x1tm;O`
z9u^iW4^;kgQ0zdcn`2yY3{1~{{lIg_&6p=Kiji_LAg8t@UzJ3*$Nsd>51qk7tCWdP
zg8UdW4L<K0AbFy`aPO42I)c?jW9?gm-)SCV^^wUzPf1_Aad&LjPH^sfLIQ^RT?Y+q
T^E^(lu8sd{_{N!O7+y`)b#Mm5

diff --git a/overlay/zdt/configs/common-packages.conf b/overlay/zdt/configs/common-packages.conf
index 14b1323..9580b11 100644
--- a/overlay/zdt/configs/common-packages.conf
+++ b/overlay/zdt/configs/common-packages.conf
@@ -16,6 +16,7 @@ dhclient        = true
 monit           = true
 busybox-extras  = true
 tcpdump         = true
+neofetch        = edge-community
 tiny-cloud          = edge-main
 tiny-cloud-openrc   = edge-main
 tiny-cloud-network  = edge-main
diff --git a/overlay/zdt/configs/kubezero.conf b/overlay/zdt/configs/kubezero.conf
index f3d5e56..aa6ba9a 100644
--- a/overlay/zdt/configs/kubezero.conf
+++ b/overlay/zdt/configs/kubezero.conf
@@ -5,7 +5,7 @@ include required("common.conf")
 packages { include required("kubezero-packages.conf") }
 
 description = [ "- https://kubezero.com" ]
-name = [ kubezero-1.23.10 ]
+name = [ kubezero-1.23.11 ]
 # size = 2G
 
 WHEN {
diff --git a/overlay/zdt/configs/zdt.conf b/overlay/zdt/configs/zdt.conf
index a7532a6..7d2fff7 100644
--- a/overlay/zdt/configs/zdt.conf
+++ b/overlay/zdt/configs/zdt.conf
@@ -11,13 +11,6 @@ Default {
   name = [ zdt-alpine ]
   description = [ "ZeroDownTime Alpine Images" ]
 
-  motd {
-    welcome = "Welcome to Alpine - ZeroDownTime edition"
-    version_notes = "Release Notes:\n"\
-      "* <https://kubezero.com/releases/v{kubeversion}/README.md>"
-    release_notes = "* <https://alpinelinux.org/releases/>"
-  }
-
   # initial provisioning script and data directory
   scripts     = [ setup ]
   script_dirs = [ setup.d ]
diff --git a/overlay/zdt/scripts/setup-common b/overlay/zdt/scripts/setup-common
index 4fdd039..8ea8449 100755
--- a/overlay/zdt/scripts/setup-common
+++ b/overlay/zdt/scripts/setup-common
@@ -65,4 +65,10 @@ echo 'Enable monit via init, hooked up cloudbender alerting'
 mv $TARGET/etc/profile.d/color_prompt.sh.disabled $TARGET/etc/profile.d/color_prompt.sh
 echo 'alias rs="doas bash --login"' > $TARGET/etc/profile.d/alias.sh
 
+# branding
+rm -f $TARGET/etc/motd
+cp $SETUP/neofetch.conf $TARGET/etc/neofetch.conf
+cp $SETUP/zdt-ascii.txt $TARGET/etc/neofetch-logo.txt
+echo 'neofetch --config /etc/neofetch.conf' > $TARGET/etc/profile.d/motd.sh
+
 printf '\n# Zero Down Time config applied'
diff --git a/overlay/zdt/scripts/setup.d/neofetch.conf b/overlay/zdt/scripts/setup.d/neofetch.conf
new file mode 100644
index 0000000..5346986
--- /dev/null
+++ b/overlay/zdt/scripts/setup.d/neofetch.conf
@@ -0,0 +1,34 @@
+print_info() {
+    echo -e "\n\n"
+
+    prin "$(color 1)Welcome to Alpine - ZeroDownTime edition"
+    echo
+    prin "Release Notes:"
+    prin "  - <https://kubezero.com/releases/v1.23/README.md>"
+    prin "  - <https://alpinelinux.org/releases/>"
+    echo
+
+    info title
+    info underline
+
+    info "Host" model
+    info "Kernel" kernel
+    info "Uptime" uptime
+    # info "Packages" packages
+    info "CPU" cpu
+    info "GPU" gpu
+    info "Memory" memory
+
+    info "GPU Driver" gpu_driver  # Linux/macOS only
+    info "CPU Usage" cpu_usage
+    info "Local IP" local_ip
+    info "Disk" disk
+
+    info underline
+}
+
+title_fqdn="on"
+memory_percent="on"
+colors=(1 2 15 15 15 15)
+image_source="/etc/neofetch-logo.txt"
+gap=0
diff --git a/overlay/zdt/scripts/setup.d/zdt-ascii.txt b/overlay/zdt/scripts/setup.d/zdt-ascii.txt
new file mode 100644
index 0000000..b3e74e5
--- /dev/null
+++ b/overlay/zdt/scripts/setup.d/zdt-ascii.txt
@@ -0,0 +1,21 @@
+\x1b[38;2;32;120;108m                   ..
+                ox@@@@@x                    
+            -x@@@@@@@@@@@@x-                
+        .x@@@x-          -x@@@x.            
+     ox@@@@x  ox@@@@@@@@x-  x@@@@xo         
+   @@@@@@@@  x@@@@@@@@@@@@x  @@@@@@@@o      
+ o    @@@@@x  -x@@@@@@@@x-  x@@@@@    o     
+ @@@x-    @@@x-          -x@@@o   .x@@@. 
+ @@@@@@@x.   x@@@@@@@@@@@@@    o@@@@@@@. 
+ @@@@@@@@@@xo    @@@@@@    -x@@@@@xx@@@.
+ @@@@@@@@@@@@@@x-      .x@@@@@x-   -@@@.
+ @@@@@@@@  @@@@@@@@  x@@@@@x   ox  x@@@.
+ @@@@ -@@  @@@@@@@@  @@@@  -x@@x .@@@@@.
+ @@@@x  @  @@@@@@@@  @@@x  .-o    .x@@@.
+ @@@@@x    @xoo@@@@  @@@@xx  .xxx  -@@@.
+ @@@@@@@       @@@@  @@@@@  x@xo   x@@@.
+  @@@@@@@. -x@@@@@@  @@@@  x.  -x@@@@@  
+     .@@@@@@@@@@@@@  @@@x  .x@@@@@x     
+         x@@@@@@@@@  @@@@x@@@@@         
+             @@@@@@  @@@@@@.            
+                o@@  @@x