From 2ba430ee9f5e68c05a237cc006d938bf5296431e Mon Sep 17 00:00:00 2001
From: Max Jonas Werner <mail@makk.es>
Date: Wed, 5 Aug 2020 10:57:48 +0200
Subject: [PATCH 1/2] fix: pass correct values to Helm release in deploy script

The structure has been changed in
12b16661959272f01f1ae7b700ba2acbda43722e but the deploy script has
not, which led to the e2e cluster always loading the default image
quay.io/kubernetes-multicluster/kubefed:canary.

This commit changes the deploy script accordingly so that it passes in
the correct values again.
---
 scripts/deploy-kubefed.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/deploy-kubefed.sh b/scripts/deploy-kubefed.sh
index 8ed218e744..278765dd68 100755
--- a/scripts/deploy-kubefed.sh
+++ b/scripts/deploy-kubefed.sh
@@ -95,8 +95,12 @@ function helm-deploy-cmd {
   local tag="${5}"
 
   echo "helm install charts/kubefed --name ${name} --namespace ${ns} \
-      --set controllermanager.repository=${repo} --set controllermanager.image=${image} \
-      --set controllermanager.tag=${tag}"
+      --set controllermanager.controller.repository=${repo} \
+      --set controllermanager.controller.image=${image} \
+      --set controllermanager.controller.tag=${tag}" \
+      --set controllermanager.webhook.repository=${repo} \
+      --set controllermanager.webhook.image=${image} \
+      --set controllermanager.webhook.tag=${tag}"
 }
 
 function kubefed-admission-webhook-ready() {

From 666be9efcc926101a7b2b621a953ceceda153c8d Mon Sep 17 00:00:00 2001
From: Max Jonas Werner <makkes@users.noreply.github.com>
Date: Wed, 5 Aug 2020 11:22:01 +0200
Subject: [PATCH 2/2] fix: typo

---
 scripts/deploy-kubefed.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deploy-kubefed.sh b/scripts/deploy-kubefed.sh
index 278765dd68..3a135ea556 100755
--- a/scripts/deploy-kubefed.sh
+++ b/scripts/deploy-kubefed.sh
@@ -97,7 +97,7 @@ function helm-deploy-cmd {
   echo "helm install charts/kubefed --name ${name} --namespace ${ns} \
       --set controllermanager.controller.repository=${repo} \
       --set controllermanager.controller.image=${image} \
-      --set controllermanager.controller.tag=${tag}" \
+      --set controllermanager.controller.tag=${tag} \
       --set controllermanager.webhook.repository=${repo} \
       --set controllermanager.webhook.image=${image} \
       --set controllermanager.webhook.tag=${tag}"