@@ -65,9 +65,6 @@ function run-e2e-tests() {
6565}
6666
6767function run-e2e-upgrade-test() {
68- check-command-installed kubectl
69- check-command-installed helm
70-
7168 HOST_CLUSTER=" $( kubectl config current-context) "
7269
7370 echo " Adding a repo to install an older kubefed version"
@@ -78,7 +75,7 @@ function run-e2e-upgrade-test() {
7875 KUBEFED_UPGRADE_TEST_VERSION=$( helm search repo kubefed-charts/kubefed --versions | awk ' {print $2}' | head -3 | tail -1)
7976
8077 echo " Installing an older kubefed version v${KUBEFED_UPGRADE_TEST_VERSION} "
81- helm install kubefed kubefed-charts/kubefed --namespace ${KUBEFED_UPGRADE_TEST_NS} --version=v${KUBEFED_UPGRADE_TEST_VERSION} --create-namespace
78+ helm install kubefed kubefed-charts/kubefed --namespace ${KUBEFED_UPGRADE_TEST_NS} --version=v${KUBEFED_UPGRADE_TEST_VERSION} --create-namespace --wait
8279
8380 deployment-image-as-expected " ${KUBEFED_UPGRADE_TEST_NS} " kubefed-admission-webhook admission-webhook " quay.io/kubernetes-multicluster/kubefed:v${KUBEFED_UPGRADE_TEST_VERSION} "
8481 deployment-image-as-expected " ${KUBEFED_UPGRADE_TEST_NS} " kubefed-controller-manager controller-manager " quay.io/kubernetes-multicluster/kubefed:v${KUBEFED_UPGRADE_TEST_VERSION} "
@@ -91,10 +88,10 @@ function run-e2e-upgrade-test() {
9188 local tag=${image_tag#*: }
9289
9390 helm upgrade -i kubefed charts/kubefed --namespace ${KUBEFED_UPGRADE_TEST_NS} \
94- --set controllermanager.controller.repository=${repo } \
91+ --set controllermanager.controller.repository=${repository } \
9592 --set controllermanager.controller.image=${image} \
9693 --set controllermanager.controller.tag=${tag} \
97- --set controllermanager.webhook.repository=${repo } \
94+ --set controllermanager.webhook.repository=${repository } \
9895 --set controllermanager.webhook.image=${image} \
9996 --set controllermanager.webhook.tag=${tag} \
10097 --set controllermanager.featureGates.CrossClusterServiceDiscovery=Enabled,controllermanager.featureGates.FederatedIngress=Enabled,controllermanager.featureGates.RawResourceStatusCollection=Enabled \
0 commit comments