From bcffd9dd220e645de5f3d602bfc59a5ff214b012 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 3 May 2022 18:39:12 +0200
Subject: [PATCH] fix: various tweaks and cleanups for 1.22

---
 Makefile                                        |   4 ++--
 overlay/zdt/configs/access.conf.age             | Bin 630 -> 630 bytes
 overlay/zdt/scripts/setup-common                |   4 ++++
 overlay/zdt/scripts/setup-kubernetes            |  14 ++++++--------
 .../stefan@zero-downtime.net-61bb6bfb.rsa.pub   |   9 ---------
 5 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 overlay/zdt/scripts/setup.d/stefan@zero-downtime.net-61bb6bfb.rsa.pub

diff --git a/Makefile b/Makefile
index 8276239..c96f636 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 OVERLAY := $(shell pwd)/overlay
-# FILTER := --only 3.15 kubezero --skip aarch64
-FILTER := --only 3.15 --skip aarch64
+ONLY :=
+FILTER := --only 3.15 $(ONLY) --skip aarch64
 STEP := publish
 
 all: build
diff --git a/overlay/zdt/configs/access.conf.age b/overlay/zdt/configs/access.conf.age
index 63556ad7842c4cbef3a783d86fc5ad02ba9e7e54..ea2c75bb6654bd306cec8ebd9fc8b0e117c98545 100644
GIT binary patch
delta 609
zcmV-n0-pW$1oi}wAb&J*HECu?QdM$DNn~1dMR71_F-2=*S58K3R5xNPX-q3oNH2PC
zOhROMI0`g$dP-JKW;ZugW-&@}HDq;CQ%pHxOG`FVY++1lXEbJPQb~6~LUws}MG7q~
zEg*DKb!13JPjydmXEZc0IBixpD>!mVFf?{6R#|XuS#WA-FMno7cXU=$VP^`dp|?AJ
zB3>TV2!GDnOJ<q~9U}cL7%g=yWz%7sz29zw@~{7rdtdKBOW^%jEs<x~s{KXp^uZ%e
ze*))W9s~In!EotJ^x^&er*mAq9aS67R71Fp;uW-A34-AW#%$CR89v8l9F<T89f6^P
znH0+nuqGZRqknRjnl*DddR0PXILD5*OTaS_V4HN!gf9F8?Dt31^s1L)QgB?FE_=Tp
zstf20tUh<Guk80@`xjNYN{}mTo*fJ+cu+&mb2i|L)@*LW&PDvJUi=GTm48cohw`n;
zqt}R#8Ha-M^a(tntF_a-+Lj!Fy*a!KWY`*MCDFMB-G2z=ca`u%5Jz$=tb~1lhh40a
zc~Ag{jb){rZr-+}A>)Tt<Ax=yF>Hy`9La4xGP<gBAM^$97P~%%8`4wU(3Gd$w8Buw
z0j(Lnu8^Z!?kqM30x8$G2vgMXQ}OxE>vlnjC^Ah_47BkT1vQ4-3RxLKatPt!=a6xB
zH&$dAl3E>89EMa2#>HWdV%<x-+X2Vz%<O|zM!<^<>OME**wCrvA>x~0Mcy;8?Q6(U
v=AUoNAixHAajmXLq>&YbNeZJ#VF^JK<)QXc&5Mr2&ag+L^mJJSDW*uib^jH#

delta 609
zcmV-n0-pW$1oi}wAb(+4XgO44S4nX=PHRp=PFFKod2co|F=<RpMPy22R8d1gGkRBa
zV{2?uV+v+gNo#sILPm0QN<&LVHgHf_OnPTEOfhtAbVxK%GI>l%Q*AX!Q*JbOYYHtb
zEg)7-OIj~zLpU@=ZdYkIW<^m~LuGV9IX7A>G;M5iZBa-oR(~&8XG=jeb2JKzgt*bY
z6WXR&Pg|WE;>~8KAU}f0y$1e$i)^8Yj~DHTH8syIQ4N6VV6?@U_}*Ef)a*<uGdqep
zhp)T^I3_{GS!|1-ibvzr78Th<b<{-`oUJwG%xUU%E=_6E|E$t}7=xC7A!Z7Ld>ER}
zQEG)5(O#>Mrhj{j^~`oN^@Yi%;N_h;q4e^Z@EY(Nt=(!t2>|m``FF<^oJ*<W_I(Mu
ziS$`#`&G<9l;1?ZOr-L->isCHcGc6Nxy$kR%PktRDP6yibyuOEx$13r=nX-0&VH$+
zn+Px%A>sFgquMSAv-Q1sY!>sYCSL?ut}l47>1}9x^M4>N_pdnNxXdFi*4$?k-$DyL
zWwiS@bj92T-I*s%V-*N_dH3#;&UOX!x;d-*G1m0e{cnC=8Yt2Hv?a>BBqH10sx(P|
z_E60j{fq7t*qw_eqhQP23W(i}d)9=?ppnChUme~F!@xGGX^Y;+%o<T*_9zB&rp`1A
z`FR!%aatsqDH|LG#>%_qNf*oS-SUHSw&Gc72k$~*2*BbAD71UN6txY^oU1s`PbAYz
vpp;k0FAlcYwWx+Lge3``EZp<{)9bLC<=a{T*gG0d@yqT23Du<qmXHTM3N<19

diff --git a/overlay/zdt/scripts/setup-common b/overlay/zdt/scripts/setup-common
index 7b88f64..17ca33e 100755
--- a/overlay/zdt/scripts/setup-common
+++ b/overlay/zdt/scripts/setup-common
@@ -37,4 +37,8 @@ sed -i -e 's,#!/usr/bin/env python,#!/usr/bin/env python3,' $TARGET/usr/local/bi
 chmod +x $TARGET/usr/local/bin/ps_mem.py
 echo 'Installed ps_mem.py'
 
+# QoL
+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
+
 printf '\n# Zero Down Time config applied'
diff --git a/overlay/zdt/scripts/setup-kubernetes b/overlay/zdt/scripts/setup-kubernetes
index e986905..dde4c8e 100755
--- a/overlay/zdt/scripts/setup-kubernetes
+++ b/overlay/zdt/scripts/setup-kubernetes
@@ -7,22 +7,20 @@ SETUP=/tmp/setup.d
 TARGET=/mnt
 
 KUBE_VERSION=1.22
-AWS_IAM_VERSION=0.5.6
+AWS_IAM_VERSION=0.5.7
 
 # Enable ZDT repo
 echo "@kubezero https://cdn.zero-downtime.net/alpine/v${VERSION}/kubezero" >> "$TARGET/etc/apk/repositories"
-install -o root -g root -Dm600 -t $TARGET/etc/apk/keys $SETUP/stefan@zero-downtime.net-61bb6bfb.rsa.pub
+wget -q -O $TARGET/etc/apk/keys/stefan@zero-downtime.net-61bb6bfb.rsa.pub https://cdn.zero-downtime.net/alpine/stefan@zero-downtime.net-61bb6bfb.rsa.pub
 
 apk -U --root "$TARGET" --no-cache add \
   cri-tools@kubezero \
   cri-o@kubezero=~$KUBE_VERSION \
   kubelet@kubezero=~$KUBE_VERSION \
-  kubectl@kubezero=~$KUBE_VERSION
-
-# aws-iam-authenticator
-wget -qO $TARGET/usr/local/bin/aws-iam-authenticator https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v${AWS_IAM_VERSION}/aws-iam-authenticator_${AWS_IAM_VERSION}_linux_amd64 
-chmod +x $TARGET/usr/local/bin/aws-iam-authenticator
-echo "Installed aws-iam-authenticator binary version $AWS_IAM_VERSION"
+  kubectl@kubezero=~$KUBE_VERSION \
+  ecr-credential-provider@kubezero=~$KUBE_VERSION \
+  aws-iam-authenticator@kubezero=~$AWS_IAM_VERSION \
+  aws-neuron-driver@kubezero
 
 # Pre-load container images
 # echo 'Pre-loaded Kubernetes control container images'
diff --git a/overlay/zdt/scripts/setup.d/stefan@zero-downtime.net-61bb6bfb.rsa.pub b/overlay/zdt/scripts/setup.d/stefan@zero-downtime.net-61bb6bfb.rsa.pub
deleted file mode 100644
index 74a7edb..0000000
--- a/overlay/zdt/scripts/setup.d/stefan@zero-downtime.net-61bb6bfb.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6BP/2VTRKfWmGtcJKf10
-tHrjiOir0BUqxTlYRwOtRv2iSs2aNaxs89sH+ZCNGxao1n+zBijhI2UFbp/nxGO5
-ftCPZicirASBmFN0XMg94nCt/vz+KCYjU+ASqlM/4uRFk0zf+loknzLgyyGD3SUT
-tR9NCsOsZWN4sRTGDAAkseCqPOTsG/7c7bDWaEr1Gq2LQdV12KU1OqkSoR+aH9lk
-xBdKMIgXssHiTQZevgMo515Z5kqaMBsOojpNUNjq7sPHmpKFlJJ93Id0QfH9duPk
-0oWzT5XJdh6lrilYDAU4Bs4QNVGr1i27dQXRL57m5Gp1u705rwNjUmzwpZtCStwd
-YwIDAQAB
------END PUBLIC KEY-----