From 58522147de1aadf9c4421fffafd3f90681604abb Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 8 Mar 2022 11:42:40 +0100
Subject: [PATCH] fix: final fixes for 1.21

---
 containers/admin/v1.21/kubezero.sh     | 2 +-
 containers/admin/v1.21/migrate_argo.sh | 2 +-
 containers/admin/v1.21/upgrade_121.sh  | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/containers/admin/v1.21/kubezero.sh b/containers/admin/v1.21/kubezero.sh
index 6950ef4e..38061ef9 100755
--- a/containers/admin/v1.21/kubezero.sh
+++ b/containers/admin/v1.21/kubezero.sh
@@ -11,7 +11,7 @@ export WORKDIR=/tmp/kubezero
 export HOSTFS=/host
 export VERSION=v1.21
 export NETWORK_VERSION=0.1.7
-export ADDONS_VERSION=0.4.2
+export ADDONS_VERSION=0.4.3
 
 export KUBECONFIG="${HOSTFS}/root/.kube/config"
 
diff --git a/containers/admin/v1.21/migrate_argo.sh b/containers/admin/v1.21/migrate_argo.sh
index f4f0eb79..11c597e7 100755
--- a/containers/admin/v1.21/migrate_argo.sh
+++ b/containers/admin/v1.21/migrate_argo.sh
@@ -5,7 +5,7 @@ YAML=$1
 # Convert keys
 yq eval -i '
   .spec.source.repoURL="https://cdn.zero-downtime.net/charts" |
-  .spec.source.targetRevision="1.21.9-1" |
+  .spec.source.targetRevision="1.21.9-3" |
   del(.spec.source.helm.parameters)' $YAML
 
 # Extract values
diff --git a/containers/admin/v1.21/upgrade_121.sh b/containers/admin/v1.21/upgrade_121.sh
index 4ab97fb1..c53f5e91 100755
--- a/containers/admin/v1.21/upgrade_121.sh
+++ b/containers/admin/v1.21/upgrade_121.sh
@@ -8,7 +8,6 @@ VERSION="v1.21.9"
 unset AWS_DEFAULT_PROFILE
 
 nodes=$(kubectl get nodes -l node-role.kubernetes.io/control-plane -o json | jq .items[].metadata.name -r)
-
 for node in $nodes; do
   echo "Deploying node upgrade job on $node..."