From 45e95f9bef358e052930d3235ec74a66603293b4 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 19 Apr 2022 14:26:09 +0000
Subject: [PATCH] fix: Update MOTD

---
 audit_grants.sh              | 10 +++++-----
 overlay/zdt/configs/zdt.conf | 16 ++++------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/audit_grants.sh b/audit_grants.sh
index 56a7ae6..e86b58c 100755
--- a/audit_grants.sh
+++ b/audit_grants.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 #set -x
 
+MY_ACCOUNT=$(aws sts get-caller-identity --output json | jq -r .Account)
 
 for r in $(aws ec2 describe-regions --query "Regions[].{Name:RegionName}" --output text); do
+  keyAlias="arn:aws:kms:${r}:${MY_ACCOUNT}:alias/zdt/amis"
+  keyArn=$(aws kms describe-key --region $r --key-id $keyAlias --output json 2>/dev/null | jq -r '.KeyMetadata.Arn')
 
-  keyAlias="arn:aws:kms:${r}:533404190593:alias/zdt/amis"
-	keyArn=$(aws kms describe-key --region $r --key-id $keyAlias --output json 2>/dev/null | jq -r '.KeyMetadata.Arn')
-
-	if [ -n "$keyArn" ]; then
-		aws kms list-grants --region $r --key-id $keyArn --output json | jq '.Grants[]'
+  if [ -n "$keyArn" ]; then
+    aws kms list-grants --region $r --key-id $keyArn --output json | jq '.Grants[]'
   fi
 done
diff --git a/overlay/zdt/configs/zdt.conf b/overlay/zdt/configs/zdt.conf
index 0f97bd6..8cc63b6 100644
--- a/overlay/zdt/configs/zdt.conf
+++ b/overlay/zdt/configs/zdt.conf
@@ -1,11 +1,11 @@
 # vim: ts=2 et:
 
 project = zdt-alpine
-kubeversion = 1.21
 
 # all build configs start with these
 Default {
   project = ${project}
+  kubeversion = 1.22
 
   # image name/description components
   encryption_key_id = null
@@ -13,15 +13,10 @@ Default {
   description = [ "ZeroDownTime Alpine Images" ]
 
   motd {
-    welcome = "Welcome to Alpine!"
-
-    wiki = "The Alpine Wiki contains a large amount of how-to guides and general\n"\
-      "information about administrating Alpine systems.\n"\
-      "See <https://wiki.alpinelinux.org/>."
-
+    welcome = "Welcome to Alpine - ZeroDownTime edition"
     version_notes = "Release Notes:\n"\
-      "* <https://alpinelinux.org/posts/alpine-{version}.0/released.html>"
-    release_notes = "* <https://alpinelinux.org/posts/{release}/released.html"
+      "* <https://kubezero.com/releases/v{kubeversion}/README.md>"
+    release_notes = "* <https://alpinelinux.org/releases/>"
   }
 
   # initial provisioning script and data directory
@@ -80,9 +75,6 @@ Mandatory {
   name        = [ "r{revision}" ]
   encryption_key_id = "alias/zdt/amis"
 
-  # final motd message
-  motd.motd_change = "You may change this message by editing /etc/motd."
-
   # final provisioning script
   scripts = [ cleanup ]