@@ -65,9 +65,6 @@ function run-e2e-tests() {
65
65
}
66
66
67
67
function run-e2e-upgrade-test() {
68
- check-command-installed kubectl
69
- check-command-installed helm
70
-
71
68
HOST_CLUSTER=" $( kubectl config current-context) "
72
69
73
70
echo " Adding a repo to install an older kubefed version"
@@ -78,7 +75,7 @@ function run-e2e-upgrade-test() {
78
75
KUBEFED_UPGRADE_TEST_VERSION=$( helm search repo kubefed-charts/kubefed --versions | awk ' {print $2}' | head -3 | tail -1)
79
76
80
77
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
82
79
83
80
deployment-image-as-expected " ${KUBEFED_UPGRADE_TEST_NS} " kubefed-admission-webhook admission-webhook " quay.io/kubernetes-multicluster/kubefed:v${KUBEFED_UPGRADE_TEST_VERSION} "
84
81
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() {
91
88
local tag=${image_tag#*: }
92
89
93
90
helm upgrade -i kubefed charts/kubefed --namespace ${KUBEFED_UPGRADE_TEST_NS} \
94
- --set controllermanager.controller.repository=${repo } \
91
+ --set controllermanager.controller.repository=${repository } \
95
92
--set controllermanager.controller.image=${image} \
96
93
--set controllermanager.controller.tag=${tag} \
97
- --set controllermanager.webhook.repository=${repo } \
94
+ --set controllermanager.webhook.repository=${repository } \
98
95
--set controllermanager.webhook.image=${image} \
99
96
--set controllermanager.webhook.tag=${tag} \
100
97
--set controllermanager.featureGates.CrossClusterServiceDiscovery=Enabled,controllermanager.featureGates.FederatedIngress=Enabled,controllermanager.featureGates.RawResourceStatusCollection=Enabled \
0 commit comments